Attachment 59984 Details for Bug 40172 – manual revert of offending patch

[patch] manual revert of offending patch

0001-manual-revert-for-40172.patch (text/plain), 1.29 KB, created by Daniel Vetter on 2012-04-14 10:44:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2012-04-14 10:44:31 UTC

Size: 1.29 KB

patch

obsolete

>From c99987f00c84149f278e35116a36399a9719789a Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Sat, 14 Apr 2012 19:44:15 +0200
>Subject: [PATCH] manual revert for 40172
>
>---
> drivers/gpu/drm/i915/intel_display.c |    4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 33aaad3..935c459 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -1602,6 +1602,7 @@ static void intel_disable_pch_ports(struct drm_i915_private *dev_priv,
> {
> 	u32 reg, val;
> 
>+#if 0
> 	val = I915_READ(PCH_PP_CONTROL);
> 	I915_WRITE(PCH_PP_CONTROL, val | PANEL_UNLOCK_REGS);
> 
>@@ -1614,6 +1615,7 @@ static void intel_disable_pch_ports(struct drm_i915_private *dev_priv,
> 	if (adpa_pipe_enabled(dev_priv, val, pipe))
> 		I915_WRITE(reg, val & ~ADPA_DAC_ENABLE);
> 
>+#endif
> 	reg = PCH_LVDS;
> 	val = I915_READ(reg);
> 	if (lvds_pipe_enabled(dev_priv, val, pipe)) {
>@@ -1623,9 +1625,11 @@ static void intel_disable_pch_ports(struct drm_i915_private *dev_priv,
> 		udelay(100);
> 	}
> 
>+#if 0
> 	disable_pch_hdmi(dev_priv, pipe, HDMIB);
> 	disable_pch_hdmi(dev_priv, pipe, HDMIC);
> 	disable_pch_hdmi(dev_priv, pipe, HDMID);
>+#endif
> }
> 
> static void i8xx_disable_fbc(struct drm_device *dev)
>-- 
>1.7.10
>

Actions: View | Splinter Review

Attachments on bug 40172: 50311 | 50312 | 50313 | 50314 | 50315 | 50316 | 50317 | 50318 | 50319 | 59984

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.