Attachment 313952 Details for Bug 454305 – Disable VGA plane even if QUIRK_PIPEA_FORCE is set

[patch] Disable VGA plane even if QUIRK_PIPEA_FORCE is set

intel-2.4.0-leave-pipea-alone.patch (text/plain), 2.33 KB, created by Olivier Fourdan on 2008-08-11 11:46:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Fourdan

Created: 2008-08-11 11:46:20 UTC

Size: 2.33 KB

patch

obsolete

>--- xf86-video-intel-2.4.0/src/i830_display.c.leave-pipea-alone	2008-08-11 10:32:10.000000000 +0100
>+++ xf86-video-intel-2.4.0/src/i830_display.c	2008-08-11 10:36:15.000000000 +0100
>@@ -854,44 +854,43 @@
> 	/* Give the overlay scaler a chance to disable if it's on this pipe */
> 	i830_crtc_dpms_video(crtc, FALSE);
> 
>-	/* May need to leave pipe A on */
>-	if ((pipe == 0) && (pI830->quirk_flag & QUIRK_PIPEA_FORCE))
>-	    return;
>-
> 	/* Disable the VGA plane that we never use */
> 	OUTREG(VGACNTRL, VGA_DISP_DISABLE);
> 
>-	/* Disable display plane */
>-	temp = INREG(dspcntr_reg);
>-	if ((temp & DISPLAY_PLANE_ENABLE) != 0)
>+	/* May need to leave pipe A on */
>+	if ((pipe != 0) || (!pI830->quirk_flag & QUIRK_PIPEA_FORCE))
> 	{
>-	    OUTREG(dspcntr_reg, temp & ~DISPLAY_PLANE_ENABLE);
>-	    /* Flush the plane changes */
>-	    OUTREG(dspbase_reg, INREG(dspbase_reg));
>-	    POSTING_READ(dspbase_reg);
>-	}
>-
>-	if (!IS_I9XX(pI830)) {
>-	    /* Wait for vblank for the disable to take effect */
>-	    i830WaitForVblank(pScrn);
>+		/* Disable display plane */
>+		temp = INREG(dspcntr_reg);
>+		if ((temp & DISPLAY_PLANE_ENABLE) != 0)
>+		{
>+		    OUTREG(dspcntr_reg, temp & ~DISPLAY_PLANE_ENABLE);
>+		    /* Flush the plane changes */
>+		    OUTREG(dspbase_reg, INREG(dspbase_reg));
>+		    POSTING_READ(dspbase_reg);
>+		}
>+
>+		if (!IS_I9XX(pI830)) {
>+		    /* Wait for vblank for the disable to take effect */
>+		    i830WaitForVblank(pScrn);
>+		}
>+
>+		/* Next, disable display pipes */
>+		temp = INREG(pipeconf_reg);
>+		if ((temp & PIPEACONF_ENABLE) != 0) {
>+		    OUTREG(pipeconf_reg, temp & ~PIPEACONF_ENABLE);
>+		    POSTING_READ(pipeconf_reg);
>+		}
>+
>+		/* Wait for vblank for the disable to take effect. */
>+		i830WaitForVblank(pScrn);
>+
>+		temp = INREG(dpll_reg);
>+		if ((temp & DPLL_VCO_ENABLE) != 0) {
>+		    OUTREG(dpll_reg, temp & ~DPLL_VCO_ENABLE);
>+		    POSTING_READ(dpll_reg);
>+		}
> 	}
>-
>-	/* Next, disable display pipes */
>-	temp = INREG(pipeconf_reg);
>-	if ((temp & PIPEACONF_ENABLE) != 0) {
>-	    OUTREG(pipeconf_reg, temp & ~PIPEACONF_ENABLE);
>-	    POSTING_READ(pipeconf_reg);
>-	}
>-
>-	/* Wait for vblank for the disable to take effect. */
>-	i830WaitForVblank(pScrn);
>-
>-	temp = INREG(dpll_reg);
>-	if ((temp & DPLL_VCO_ENABLE) != 0) {
>-	    OUTREG(dpll_reg, temp & ~DPLL_VCO_ENABLE);
>-	    POSTING_READ(dpll_reg);
>-	}
>-
> 	/* Wait for the clocks to turn off. */
> 	usleep(150);
> 	break;

Actions: View | Diff

Attachments on bug 454305: 311184 | 311185 | 311186 | 311187 | 311189 | 313951 | 313952 | 313953 | 315563 | 315564 | 315565