On Fri, Apr 15, 2016 at 03:40:09PM -0400, Lyude wrote:
> 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 at vger.kernel.org
> Signed-off-by: Lyude <cpaul at redhat.com>
Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_crt.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_crt.c
> b/drivers/gpu/drm/i915/intel_crt.c
> index a2a31fd..220ca91 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -707,11 +707,11 @@ static int intel_crt_set_property(struct drm_connector
> *connector,
> 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 = dev->dev_private;
> - 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) {
> u32 adpa;
> @@ -733,7 +733,6 @@ static void intel_crt_reset(struct drm_connector
> *connector)
> */
>
> static const struct drm_connector_funcs intel_crt_connector_funcs = {
> - .reset = intel_crt_reset,
> .dpms = drm_atomic_helper_connector_dpms,
> .detect = intel_crt_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> @@ -751,6 +750,7 @@ static const struct drm_connector_helper_funcs
> intel_crt_connector_helper_funcs
> };
>
> static const struct drm_encoder_funcs intel_crt_enc_funcs = {
> + .reset = intel_crt_reset,
> .destroy = intel_encoder_destroy,
> };
>
> @@ -896,5 +896,5 @@ void intel_crt_init(struct drm_device *dev)
> dev_priv->fdi_rx_config = I915_READ(FDI_RX_CTL(PIPE_A)) &
> fdi_config;
> }
>
> - intel_crt_reset(connector);
> + intel_crt_reset(&crt->base.base);
> }
> --
> 2.5.5
--
Ville Syrjälä
Intel OTC
