From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2 1/2] drm/i915/vlv: Make intel_crt_reset() per-encoder Date: Mon, 18 Apr 2016 11:32:31 +0300 Message-ID: <20160418083231.GZ4329@intel.com> References: <1459284390-14485-1-git-send-email-cpaul@redhat.com> <1460749210-23577-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1460749210-23577-1-git-send-email-cpaul@redhat.com> Sender: stable-owner@vger.kernel.org To: Lyude Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Daniel Vetter , Jani Nikula , David Airlie , "open list:INTEL DRM DRIVERS (excluding Poulsbo, Moorestow...), linux-kernel@vger.kernel.org (open list)" List-Id: dri-devel@lists.freedesktop.org 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. >=20 > CC: stable@vger.kernel.org > Signed-off-by: Lyude Reviewed-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/intel_crt.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) >=20 > 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_co= nnector *connector, > return 0; > } > =20 > -static void intel_crt_reset(struct drm_connector *connector) > +static void intel_crt_reset(struct drm_encoder *encoder) > { > - struct drm_device *dev =3D connector->dev; > + struct drm_device *dev =3D encoder->dev; > struct drm_i915_private *dev_priv =3D dev->dev_private; > - struct intel_crt *crt =3D intel_attached_crt(connector); > + struct intel_crt *crt =3D intel_encoder_to_crt(to_intel_encoder(enc= oder)); > =20 > if (INTEL_INFO(dev)->gen >=3D 5) { > u32 adpa; > @@ -733,7 +733,6 @@ static void intel_crt_reset(struct drm_connector = *connector) > */ > =20 > static const struct drm_connector_funcs intel_crt_connector_funcs =3D= { > - .reset =3D intel_crt_reset, > .dpms =3D drm_atomic_helper_connector_dpms, > .detect =3D intel_crt_detect, > .fill_modes =3D drm_helper_probe_single_connector_modes, > @@ -751,6 +750,7 @@ static const struct drm_connector_helper_funcs in= tel_crt_connector_helper_funcs > }; > =20 > static const struct drm_encoder_funcs intel_crt_enc_funcs =3D { > + .reset =3D intel_crt_reset, > .destroy =3D intel_encoder_destroy, > }; > =20 > @@ -896,5 +896,5 @@ void intel_crt_init(struct drm_device *dev) > dev_priv->fdi_rx_config =3D I915_READ(FDI_RX_CTL(PIPE_A)) & fdi_co= nfig; > } > =20 > - intel_crt_reset(connector); > + intel_crt_reset(&crt->base.base); > } > --=20 > 2.5.5 --=20 Ville Syrj=E4l=E4 Intel OTC