Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28cf71ce authored by Lyude's avatar Lyude Committed by Daniel Vetter
Browse files

drm/i915/vlv: Make intel_crt_reset() per-encoder 



This lets call intel_crt_reset() in contexts where IRQs are disabled and
as such, can't hold the locks required to work with the connectors.

Cc: stable@vger.kernel.org
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarLyude <cpaul@redhat.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fb7404e8

drivers/gpu/drm/i915/intel_crt.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -717,11 +717,11 @@ static int intel_crt_set_property(struct drm_connector *connector, 
	return 0;

	return 0;

}

}





static void intel_crt_reset(struct drm_connector *connector)

static void intel_crt_reset(struct drm_encoder *encoder)

{

{

	struct drm_device *dev = connector->dev;

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_crt *crt = intel_attached_crt(connector);

	struct intel_crt *crt = intel_encoder_to_crt(to_intel_encoder(encoder));





	if (INTEL_INFO(dev)->gen >= 5) {

	if (INTEL_INFO(dev)->gen >= 5) {

		u32 adpa;

		u32 adpa;
@@ -743,7 +743,6 @@ static void intel_crt_reset(struct drm_connector *connector) 
 */

 */





static const struct drm_connector_funcs intel_crt_connector_funcs = {

static const struct drm_connector_funcs intel_crt_connector_funcs = {

	.reset = intel_crt_reset,

	.dpms = drm_atomic_helper_connector_dpms,

	.dpms = drm_atomic_helper_connector_dpms,

	.detect = intel_crt_detect,

	.detect = intel_crt_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.fill_modes = drm_helper_probe_single_connector_modes,
@@ -762,6 +761,7 @@ static const struct drm_connector_helper_funcs intel_crt_connector_helper_funcs 
};

};





static const struct drm_encoder_funcs intel_crt_enc_funcs = {

static const struct drm_encoder_funcs intel_crt_enc_funcs = {

	.reset = intel_crt_reset,

	.destroy = intel_encoder_destroy,

	.destroy = intel_encoder_destroy,

};

};
@@ -904,5 +904,5 @@ void intel_crt_init(struct drm_device *dev) 
		dev_priv->fdi_rx_config = I915_READ(FDI_RX_CTL(PIPE_A)) & fdi_config;

		dev_priv->fdi_rx_config = I915_READ(FDI_RX_CTL(PIPE_A)) & fdi_config;

	}

	}





	intel_crt_reset(connector);

	intel_crt_reset(&crt->base.base);

}
 
}