Attachment 1867 Details for Bug 2500 – Do not disable all pipes patch

[patch] Do not disable all pipes patch

save.patch (text/plain), 1.45 KB, created by Alan Hourihane on 2005-02-08 12:35:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Hourihane

Created: 2005-02-08 12:35:36 UTC

Size: 1.45 KB

patch

obsolete

>Index: i830_driver.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v
>retrieving revision 1.10
>diff -u -r1.10 i830_driver.c
>--- i830_driver.c	10 Jan 2005 11:29:02 -0000	1.10
>+++ i830_driver.c	8 Feb 2005 20:34:19 -0000
>@@ -4925,30 +4955,27 @@
>    I830Ptr pI830 = I830PTR(pScrn);
>    Bool on = xf86IsUnblank(mode);
>    CARD32 temp, ctrl, base;
>-   int i;
> 
>    DPRINTF(PFX, "I830BIOSSaveScreen: %d, on is %s\n", mode, BOOLTOSTRING(on));
> 
>    if (pScrn->vtSema) {
>-      for (i = 0; i < pI830->availablePipes; i++) {
>-	 if (i == 0) {
>-	    ctrl = DSPACNTR;
>-	    base = DSPABASE;
>-	 } else {
>-	    ctrl = DSPBCNTR;
>-	    base = DSPBADDR;
>-	 }
>-	 if (pI830->planeEnabled[i]) {
>-	    temp = INREG(ctrl);
>-	    if (on)
>-	       temp |= DISPLAY_PLANE_ENABLE;
>-	    else
>-	       temp &= ~DISPLAY_PLANE_ENABLE;
>-	    OUTREG(ctrl, temp);
>-	    /* Flush changes */
>-	    temp = INREG(base);
>-	    OUTREG(base, temp);
>-	 }
>+      if (pI830->pipe == 0) {
>+	 ctrl = DSPACNTR;
>+	 base = DSPABASE;
>+      } else {
>+	 ctrl = DSPBCNTR;
>+	 base = DSPBADDR;
>+      }
>+      if (pI830->planeEnabled[pI830->pipe]) {
>+	 temp = INREG(ctrl);
>+	 if (on)
>+	    temp |= DISPLAY_PLANE_ENABLE;
>+	 else
>+	    temp &= ~DISPLAY_PLANE_ENABLE;
>+	 OUTREG(ctrl, temp);
>+	 /* Flush changes */
>+	 temp = INREG(base);
>+	 OUTREG(base, temp);
>       }
> 
>       if (pI830->CursorInfoRec && !pI830->SWCursor && pI830->cursorOn) {

Actions: View | Splinter Review

Attachments on bug 2500: 1866 | 1867 | 1868 | 1869 | 1870 | 1872 | 1873 | 1874 | 1881 | 1898

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.