Attachment 37130 Details for Bug 22126 – never disable pipe a once enabled

[patch] never disable pipe a once enabled

i915-leave-pipe-a-enabled.patch (text/plain), 1.32 KB, created by Jesse Barnes on 2010-07-16 09:37:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2010-07-16 09:37:47 UTC

Size: 1.32 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index a8d65b7..6680e05 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -2255,20 +2255,23 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode)
> 			intel_wait_for_vblank(dev);
> 		}
> 
>-		/* Next, disable display pipes */
>-		temp = I915_READ(pipeconf_reg);
>-		if ((temp & PIPEACONF_ENABLE) != 0) {
>-			I915_WRITE(pipeconf_reg, temp & ~PIPEACONF_ENABLE);
>-			I915_READ(pipeconf_reg);
>-		}
>+		/* Don't disable pipe A or pipe A PLLs */
>+		if (pipeconf_reg != PIPEACONF) {
>+			/* Next, disable display pipes */
>+			temp = I915_READ(pipeconf_reg);
>+			if ((temp & PIPEACONF_ENABLE) != 0) {
>+				I915_WRITE(pipeconf_reg, temp & ~PIPEACONF_ENABLE);
>+				I915_READ(pipeconf_reg);
>+			}
> 
>-		/* Wait for vblank for the disable to take effect. */
>-		intel_wait_for_vblank(dev);
>+			/* Wait for vblank for the disable to take effect. */
>+			intel_wait_for_vblank(dev);
> 
>-		temp = I915_READ(dpll_reg);
>-		if ((temp & DPLL_VCO_ENABLE) != 0) {
>-			I915_WRITE(dpll_reg, temp & ~DPLL_VCO_ENABLE);
>-			I915_READ(dpll_reg);
>+			temp = I915_READ(dpll_reg);
>+			if ((temp & DPLL_VCO_ENABLE) != 0) {
>+				I915_WRITE(dpll_reg, temp & ~DPLL_VCO_ENABLE);
>+				I915_READ(dpll_reg);
>+			}
> 		}
> 
> 		/* Wait for the clocks to turn off. */

Actions: View | Splinter Review

Attachments on bug 22126: 26499 | 26500 | 27324 | 27806 | 27836 | 30231 | 37130 | 37132 | 37136 | 37235 | 37348

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.