From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH v2] drm/i915: Set crtc->new_config to NULL for pipes that are about to be disabled Date: Tue, 14 Jan 2014 14:35:30 +0200 Message-ID: <1389702930.8261.53.camel@intelbox> References: <1389698870-16537-1-git-send-email-ville.syrjala@linux.intel.com> <1389702698-23357-1-git-send-email-ville.syrjala@linux.intel.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1337313430==" Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 646FEFAF75 for ; Tue, 14 Jan 2014 04:35:33 -0800 (PST) In-Reply-To: <1389702698-23357-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============1337313430== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-wCtwNZgHda6zGnxZ2u8n" --=-wCtwNZgHda6zGnxZ2u8n Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2014-01-14 at 14:31 +0200, ville.syrjala@linux.intel.com wrote: > From: Ville Syrj=C3=A4l=C3=A4 >=20 > crtc->new_config is only relevant for pipes that are going to be active > post-modeset. Set the pointer to NULL for all pipes that are going to > be disabled. This is done to help catch bugs where some piece of code > would go looking at crtc->new_config even if the data there is stale. >=20 > v2: Clear new_config in disable_crtc_nofb() too (Imre) >=20 > Suggested-by: Daniel Vetter > Signed-off-by: Ville Syrj=C3=A4l=C3=A4 Reviewed-by: Imre Deak > --- > drivers/gpu/drm/i915/intel_display.c | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index 673b02e..dde98020 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -8763,6 +8763,11 @@ static void intel_modeset_update_staged_output_sta= te(struct drm_device *dev) > list_for_each_entry(crtc, &dev->mode_config.crtc_list, > base.head) { > crtc->new_enabled =3D crtc->base.enabled; > + > + if (crtc->new_enabled) > + crtc->new_config =3D &crtc->config; > + else > + crtc->new_config =3D NULL; > } > } > =20 > @@ -9195,7 +9200,9 @@ intel_modeset_update_state(struct drm_device *dev, = unsigned prepare_pipes) > list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list, > base.head) { > WARN_ON(intel_crtc->base.enabled !=3D intel_crtc_in_use(&intel_crtc->b= ase)); > - WARN_ON(intel_crtc->new_config !=3D &intel_crtc->config); > + WARN_ON(intel_crtc->new_config && > + intel_crtc->new_config !=3D &intel_crtc->config); > + WARN_ON(intel_crtc->base.enabled !=3D !!intel_crtc->new_config); > } > =20 > list_for_each_entry(connector, &dev->mode_config.connector_list, head) = { > @@ -9801,6 +9808,11 @@ static void intel_set_config_restore_state(struct = drm_device *dev, > count =3D 0; > list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head) { > crtc->new_enabled =3D config->save_crtc_enabled[count++]; > + > + if (crtc->new_enabled) > + crtc->new_config =3D &crtc->config; > + else > + crtc->new_config =3D NULL; > } > =20 > count =3D 0; > @@ -10002,6 +10014,11 @@ intel_modeset_stage_output_state(struct drm_devi= ce *dev, > crtc->new_enabled ? "en" : "dis"); > config->mode_changed =3D true; > } > + > + if (crtc->new_enabled) > + crtc->new_config =3D &crtc->config; > + else > + crtc->new_config =3D NULL; > } > =20 > return 0; > @@ -10028,6 +10045,7 @@ static void disable_crtc_nofb(struct intel_crtc *= crtc) > } > =20 > crtc->new_enabled =3D false; > + crtc->new_config =3D NULL; > } > =20 > static int intel_crtc_set_config(struct drm_mode_set *set) > @@ -10272,8 +10290,6 @@ static void intel_crtc_init(struct drm_device *de= v, int pipe) > dev_priv->plane_to_crtc_mapping[intel_crtc->plane] =3D &intel_crtc->bas= e; > dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] =3D &intel_crtc->base; > =20 > - intel_crtc->new_config =3D &intel_crtc->config; > - > drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); > } > =20 --=-wCtwNZgHda6zGnxZ2u8n Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJS1S8SAAoJEORIIAnNuWDFdmEH/iN9f9i4aLMNS3m+BMRQ819K fBx+yFuaCrkyHRtztKPmIcTloO3mFYH/9ZrtrrhzUFs4kUbSu4wVlhgdcTu+K6Ys n/eXBAxJuAgm2PUnvd5aHglg1YevauM/2oexNJEuupjTf+vWaBsDIA/cPU5iV9oy oGMfaQ1Rhu1GeHOAWfN5JSmFGjVgrdSoP2matYa9fFBAeAu+ITjTYrZoGo9j5bgq 6zzPQvvy4LjB73kHowLuWIFkhNgn4K3pTsvaFITl0HTr2NPqMn9wQi6mb9EzGFLZ YbD6AxMjWIGgOvBtsJVY4j1T6bdXWxdEm89cADVdcGxsTSO6JxOr7PK4RDBfg20= =Mmlw -----END PGP SIGNATURE----- --=-wCtwNZgHda6zGnxZ2u8n-- --===============1337313430== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============1337313430==--