Attachment 63506 Details for Bug 49233 – Revised fix patch

[patch] Revised fix patch

0001-drm-i915-Fix-eDP-blank-screen-after-S3-resume-on-HP-.patch (text/plain), 1.70 KB, created by Takashi Iwai on 2012-06-27 02:55:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Iwai

Created: 2012-06-27 02:55:37 UTC

Size: 1.70 KB

patch

obsolete

>From 6db65cbb941f9d433659bdad02b307f6d94465df Mon Sep 17 00:00:00 2001
>From: Takashi Iwai <tiwai@suse.de>
>Date: Thu, 21 Jun 2012 15:30:41 +0200
>Subject: [PATCH] drm/i915: Fix eDP blank screen after S3 resume on HP
> desktops
>
>This patch fixes the problem on some HP desktop machines with eDP
>which give blank screens after S3 resume.
>
>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.
>
>Tested with 3.5-rc3 kernel.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49233
>
>Cc: <stable@vger.kernel.org>
>Signed-off-by: Takashi Iwai <tiwai@suse.de>
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/i915_suspend.c |    5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_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
>+		 */
> 		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);
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 49233: 60708 | 60709 | 60710 | 60711 | 60712 | 60713 | 60714 | 61053 | 61054 | 61055 | 61241 | 63226 | 63506

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.