From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Menzel Subject: Re: [PATCH v2] drm/i915: Fix eDP blank screen after S3 resume on HP desktops Date: Fri, 22 Jun 2012 10:36:58 +0200 Message-ID: <1340354218.4193.3.camel@mattotaupa> References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1423184413==" Return-path: Received: from mail.gw90.de (mail.gw90.de [188.40.100.199]) by gabe.freedesktop.org (Postfix) with ESMTP id 245B99E7AE for ; Fri, 22 Jun 2012 01:37:25 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Takashi Iwai Cc: intel-gfx@lists.freedesktop.org, John Sundragon Waitz , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org --===============1423184413== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-mZ3YZXael6NoFo7c5EwL" --=-mZ3YZXael6NoFo7c5EwL Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Am Donnerstag, den 21.06.2012, 15:30 +0200 schrieb Takashi Iwai: > This patch fixes the problem on some HP desktop machines with eDP > which give blank screens after S3 resume. >=20 > It turned out that BLC_PWM_CPU_CTL must be written after > BLC_PWM_CPU_CTL2. Otherwise it doesn't take effect on these > SNB machines. >=20 > Tested with 3.5-rc3 kernel. >=20 > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=3D49233 Hmm, the bug entry does not contain a link to the discussion on intel-gfx. http://lists.freedesktop.org/archives/intel-gfx/2012-June/018418.html Maybe add it there or to the commit message. > Cc: > Signed-off-by: Takashi Iwai > --- > drivers/gpu/drm/i915/i915_suspend.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) >=20 > diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i= 915_suspend.c > index 0ede02a..a748e5c 100644 > --- a/drivers/gpu/drm/i915/i915_suspend.c > +++ b/drivers/gpu/drm/i915/i915_suspend.c > @@ -740,8 +740,11 @@ static void i915_restore_display(struct drm_device *= dev) > if (HAS_PCH_SPLIT(dev)) { > I915_WRITE(BLC_PWM_PCH_CTL1, dev_priv->saveBLC_PWM_CTL); > I915_WRITE(BLC_PWM_PCH_CTL2, dev_priv->saveBLC_PWM_CTL2); > - I915_WRITE(BLC_PWM_CPU_CTL, dev_priv->saveBLC_CPU_PWM_CTL); > + /* NOTE: BLC_PWM_CPU_CTL must be written after BLC_PWM_CPU_CTL2; > + * otherwise we get blank eDP screen after S3 on some machines Full stop at the end? Also add a reference to the list discussion or Bugzilla entry? > + */ > I915_WRITE(BLC_PWM_CPU_CTL2, dev_priv->saveBLC_CPU_PWM_CTL2); > + I915_WRITE(BLC_PWM_CPU_CTL, dev_priv->saveBLC_CPU_PWM_CTL); > I915_WRITE(PCH_PP_ON_DELAYS, dev_priv->savePP_ON_DELAYS); > I915_WRITE(PCH_PP_OFF_DELAYS, dev_priv->savePP_OFF_DELAYS); > I915_WRITE(PCH_PP_DIVISOR, dev_priv->savePP_DIVISOR); With or without these changes above, this patch is Acked-by: Paul Menzel Thanks, Paul --=-mZ3YZXael6NoFo7c5EwL 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) iEYEABECAAYFAk/kLqoACgkQPX1aK2wOHVgT1ACeIgaaB542vtZT0cRece1Ddww5 nYYAnib9djC6aW5MGgNpzTL4VxaVKIBo =wbY/ -----END PGP SIGNATURE----- --=-mZ3YZXael6NoFo7c5EwL-- --===============1423184413== 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 --===============1423184413==--