xf86-video-intel: src/i830_common.h src/i830_driver.c

[Jesse Barnes]

 src/i830_common.h |    3 ---
 src/i830_driver.c |   14 +++-----------
 2 files changed, 3 insertions(+), 14 deletions(-)

New commits:
diff-tree 445a59d262b93bd9d2c16cee9934ce77a103776b (from d02336290bea30de3c390b8121046c38fd6b0f62)
Author: Jesse Barnes <jesse.barnes at intel.com>
Date:   Wed Sep 12 09:32:41 2007 -0700

    Remove unused plane->pipe mappings from SAREA private
    
    Turns out we can get away without this, so remove it, fix a crash, and only
    swap planes/pipes if the DRM can support it.

diff --git a/src/i830_common.h b/src/i830_common.h
index a652428..391ace1 100644
--- a/src/i830_common.h
+++ b/src/i830_common.h
@@ -133,9 +133,6 @@ typedef struct {
 	int planeB_w;
 	int planeB_h;
 
-	int planeA_pipe;
-	int planeB_pipe;
-
 	/* Triple buffering */
 	drm_handle_t third_handle;
 	int third_offset;
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 4786195..1db511b 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2252,7 +2252,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
    MessageType from;
 #ifdef XF86DRI
    Bool driDisabled;
-   drmI830Sarea *sPriv;
    xf86CrtcConfigPtr config;
 #ifdef XF86DRI_MM
    unsigned long savedMMSize;
@@ -2707,14 +2706,13 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
    }
 
    config = XF86_CRTC_CONFIG_PTR(pScrn);
-   sPriv = DRIGetSAREAPrivate(pScreen);
 
    /*
     * If an LVDS display is present, swap the plane/pipe mappings so we can
     * use FBC on the builtin display.
     * Note: 965+ chips can compress either plane, so we leave the mapping
     *       alone in that case.
-    * Also, only flip the pipes if the DRM can support it.
+    * Also make sure the DRM can handle the swap.
     */
    if (I830LVDSPresent(pScrn) && !IS_I965GM(pI830) &&
        (!pI830->directRenderingEnabled ||
@@ -2725,19 +2723,13 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
 	   xf86CrtcPtr	      crtc = config->crtc[c];
 	   I830CrtcPrivatePtr   intel_crtc = crtc->driver_private;
 
-	   if (intel_crtc->pipe == 0) {
+	   if (intel_crtc->pipe == 0)
 	       intel_crtc->plane = 1;
-	       sPriv->planeB_pipe = 0;
-	   } else if (intel_crtc->pipe == 1) {
+	   else if (intel_crtc->pipe == 1)
 	       intel_crtc->plane = 0;
-	       sPriv->planeA_pipe = 1;
-	   }
       }
    }
 
-   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "drm planeA pipe: %d, "
-	      "planeB pipe: %d\n", sPriv->planeA_pipe, sPriv->planeB_pipe);
-
 #else
    pI830->directRenderingEnabled = FALSE;
 #endif