xf86-video-intel: 3 commits - src/i830_driver.c src/i830_tv.c

[Keith Packard]

 src/i830_driver.c |    5 ++---
 src/i830_tv.c     |   14 +-------------
 2 files changed, 3 insertions(+), 16 deletions(-)

New commits:
diff-tree 1e6e675524461ef0eb1983de89e2877426571a55 (from 28da6f4e307880326dd553f50fe3fff3b9be9f4f)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Fri Mar 23 23:42:52 2007 -0700

    Eliminate calls to RRPostPendingProperty.
    
    RRPostPendingProperty has been removed in favor of RRPostPendingProperties,
    and that call is now managed outside of the driver.

diff --git a/src/i830_tv.c b/src/i830_tv.c
index ac521c1..43a4dd4 100644
--- a/src/i830_tv.c
+++ b/src/i830_tv.c
@@ -1486,7 +1486,6 @@ i830_tv_create_resources(xf86OutputPtr o
 				 strlen (dev_priv->tv_format),
 				 dev_priv->tv_format,
 				 FALSE, TRUE);
-    RRPostPendingProperty (output->randr_output, tv_format_atom);
     if (err != 0) {
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		   "RRChangeOutputProperty error, %d\n", err);
@@ -1513,7 +1512,6 @@ i830_tv_create_resources(xf86OutputPtr o
 				     XA_INTEGER, 32, PropModeReplace,
 				     1, &dev_priv->margin[i],
 				     FALSE, TRUE);
-	RRPostPendingProperty (output->randr_output, margin_atoms[i]);
 	if (err != 0) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		       "RRChangeOutputProperty error, %d\n", err);
@@ -1522,16 +1520,6 @@ i830_tv_create_resources(xf86OutputPtr o
 #endif /* RANDR_12_INTERFACE */
 }
 
-static void
-i830_tv_commit (xf86OutputPtr output)
-{
-#ifdef RANDR_12_INTERFACE
-    if (output->randr_output)
-	RRPostPendingProperty (output->randr_output, tv_format_atom);
-#endif    
-    i830_output_commit (output);
-}
-
 #ifdef RANDR_12_INTERFACE
 static Bool
 i830_tv_set_property(xf86OutputPtr output, Atom property,
@@ -1593,7 +1581,7 @@ static const xf86OutputFuncsRec i830_tv_
     .mode_fixup = i830_tv_mode_fixup,
     .prepare = i830_output_prepare,
     .mode_set = i830_tv_mode_set,
-    .commit = i830_tv_commit,
+    .commit = i830_output_commit,
     .detect = i830_tv_detect,
     .get_modes = i830_tv_get_modes,
     .destroy = i830_tv_destroy,
diff-tree 28da6f4e307880326dd553f50fe3fff3b9be9f4f (from ab19439cf4592e4607dc0bfc602aba3d56645a42)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Fri Mar 23 14:36:42 2007 -0700

    Record 3D state loss at EnterVT in last_3d value.
    
    last_3d set to LAST_3D_OTHER indicates that the 3D hardware has unknown
    state.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 624f986..893f491 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2903,6 +2903,7 @@ I830EnterVT(int scrnIndex, int flags)
 
    /* Force invarient 3D state to be emitted */
    *pI830->used3D = 1<<31;
+   pI830->last_3d = LAST_3D_OTHER;
 
    return TRUE;
 }
diff-tree ab19439cf4592e4607dc0bfc602aba3d56645a42 (from 26f32ef680a19e63af4b7c8c84141fe32263f298)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Fri Mar 23 14:34:27 2007 -0700

    Don't call AdjustFrame on EnterVT.
    
    AdjustFrame is strictly for legacy compatibility; calling it on EnterVT
    wrecks crtc positions.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index f41beb0..624f986 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2734,7 +2734,7 @@ i830AdjustFrame(int scrnIndex, int x, in
    {
       /* Sync the engine before adjust frame */
       i830WaitSync(pScrn);
-      i830PipeSetBase(crtc, output->initial_x + x, output->initial_y + y);
+      i830PipeSetBase(crtc, crtc->desiredX + x, crtc->desiredY + y);
       crtc->x = output->initial_x + x;
       crtc->y = output->initial_y + y;
    }
@@ -2851,8 +2851,6 @@ I830EnterVT(int scrnIndex, int flags)
    ResetState(pScrn, TRUE);
    SetHWOperatingState(pScrn);
 
-   pScrn->AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-
 #ifdef XF86DRI
    if (pI830->directRenderingEnabled) {