xf86-video-intel: 2 commits - src/i830_modes.c src/i830_video.c

[Alan Hourihane]

 src/i830_modes.c |   12 ++++++++++--
 src/i830_video.c |   17 ++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

New commits:
diff-tree 6781575f734f05547d7d5ceef4116fc157bba44d (from e065324661ad08b3b359136f48090232f6138959)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Wed Nov 22 16:49:57 2006 +0000

    Be a little more verbose when rejecting modes.

diff --git a/src/i830_modes.c b/src/i830_modes.c
index 7d14519..002c004 100644
--- a/src/i830_modes.c
+++ b/src/i830_modes.c
@@ -394,7 +394,6 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr 
 	!I830CheckModeSupport(pScrn, mode->XResolution, mode->YResolution, id)) 
 	modeOK = FALSE;
 
-
     /*
      * Check if there's a valid monitor mode that this one can be matched
      * up with from the 'specified' modes list.
@@ -410,6 +409,9 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr 
 	    if (status == MODE_OK) {
 		modeOK = TRUE;
 		break;
+	    } else {
+    		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Not using mode \"%s\" (%s)\n", p->name,
+	       			xf86ModeStatusToString(status));
 	    }
 	}
 	if (p) {
@@ -442,6 +444,9 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr 
 			newMode = p;
 		}
 		modeOK = TRUE;
+	    } else {
+    		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Not using mode \"%s\" (%s)\n", p->name,
+	       			xf86ModeStatusToString(status));
 	    }
 	}
 	if (newMode) {
@@ -487,8 +492,11 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr 
 				modeOK = FALSE;
 			} else
 			    modeOK = TRUE;
-	            } else
+	            } else {
 	    	        modeOK = FALSE;
+    		   	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Not using mode \"%s\" (%s)\n", pMode->name,
+	       			xf86ModeStatusToString(status));
+	            }
   	            pMode->status = status;
 	        } else { 
 	            modeOK = FALSE;
diff-tree e065324661ad08b3b359136f48090232f6138959 (from b649f95ea6fd3555d073fdbf8f2f035dfe1afd33)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Wed Nov 22 16:49:36 2006 +0000

    update port attributes immediately when overlay is on.

diff --git a/src/i830_video.c b/src/i830_video.c
index 054d26b..1a1b968 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -934,14 +934,16 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
       pPriv->brightness = value;
       overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff);
       ErrorF("BRIGHTNESS\n");
-      OVERLAY_UPDATE;
+      if (*pI830->overlayOn)
+         OVERLAY_UPDATE;
    } else if (attribute == xvContrast) {
       if ((value < 0) || (value > 255))
 	 return BadValue;
       pPriv->contrast = value;
       overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff);
       ErrorF("CONTRAST\n");
-      OVERLAY_UPDATE;
+      if (*pI830->overlayOn)
+         OVERLAY_UPDATE;
    } else if (pI830->Clone && attribute == xvPipe) {
       if ((value < 0) || (value > 1))
          return BadValue;
@@ -955,7 +957,8 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
       else 
          overlay->OCONFIG |= OVERLAY_PIPE_B;
       ErrorF("PIPE CHANGE\n");
-      OVERLAY_UPDATE;
+      if (*pI830->overlayOn)
+         OVERLAY_UPDATE;
    } else if (attribute == xvGamma0 && (IS_I9XX(pI830))) {
       pPriv->gamma0 = value; 
    } else if (attribute == xvGamma1 && (IS_I9XX(pI830))) {
@@ -982,7 +985,8 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
 	 break;
       }
       ErrorF("COLORKEY\n");
-      OVERLAY_UPDATE;
+      if (*pI830->overlayOn)
+         OVERLAY_UPDATE;
       REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
    } else if(attribute == xvDoubleBuffer) {
       if ((value < 0) || (value > 1))
@@ -1000,13 +1004,8 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
         attribute == xvGamma3 ||
         attribute == xvGamma4 ||
         attribute == xvGamma5) && (IS_I9XX(pI830))) {
-	CARD32 r = overlay->OCMD & OVERLAY_ENABLE;
         ErrorF("GAMMA\n");
-        overlay->OCMD &= ~OVERLAY_ENABLE;
-        OVERLAY_UPDATE;
 	I830UpdateGamma(pScrn);
-        overlay->OCMD |= r;
-        OVERLAY_UPDATE;
    }
 
    return Success;