From 636adcd57f1c5b33edf2d8fbf9e7fa9aac1ccb1a Mon Sep 17 00:00:00 2001
From: root <root@treble.(none)>
Date: Sat, 10 Mar 2007 22:12:39 -0800
Subject: Get rid of BackendMode and disable hw cursor for now.

---
 src/g80_cursor.c  |  3 +++
 src/g80_display.c |  3 ---
 src/g80_driver.c  | 35 ++++++++---------------------------
 src/g80_type.h    |  1 -
 4 files changed, 11 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/g80_cursor.c b/src/g80_cursor.c
index 07422e5..f416860 100644
--- a/src/g80_cursor.c
+++ b/src/g80_cursor.c
@@ -21,6 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#if 0
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -183,3 +184,5 @@ Bool G80CursorInit(ScreenPtr pScreen)
 
     return xf86InitCursor(pScreen, infoPtr);
 }
+
+#endif
diff --git a/src/g80_display.c b/src/g80_display.c
index 068e902..95c3d34 100644
--- a/src/g80_display.c
+++ b/src/g80_display.c
@@ -338,9 +338,6 @@ G80DispSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
     const int headOff = 0x400 * pNv->head;
     int interlaceDiv, fudge;
 
-    if(pNv->BackendMode)
-        mode = pNv->BackendMode;
-
     pNv->pclk = mode->SynthClock;
 
     /* Magic mode timing fudge factor */
diff --git a/src/g80_driver.c b/src/g80_driver.c
index 2a3120f..4bef070 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -95,13 +95,11 @@ static const char *int10Symbols[] = {
 typedef enum {
     OPTION_HW_CURSOR,
     OPTION_NOACCEL,
-    OPTION_BACKEND_MODE,
 } G80Opts;
 
 static const OptionInfoRec G80Options[] = {
     { OPTION_HW_CURSOR,         "HWCursor",     OPTV_BOOLEAN,   {0}, FALSE },
     { OPTION_NOACCEL,           "NoAccel",      OPTV_BOOLEAN,   {0}, FALSE },
-    { OPTION_BACKEND_MODE,      "BackendMode",  OPTV_ANYSTR,    {0}, FALSE },
     { -1,                       NULL,           OPTV_NONE,      {0}, FALSE }
 };
 
@@ -342,31 +340,6 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
     xf86PrintModes(pScrn);
     xf86SetDpi(pScrn, 0, 0);
 
-    /* Custom backend timings */
-    pNv->BackendMode = NULL;
-    if((s = xf86GetOptValString(pNv->Options, OPTION_BACKEND_MODE))) {
-        DisplayModePtr mode;
-
-        for(mode = pScrn->modes; ; mode = mode->next) {
-            if(!strcmp(mode->name, s))
-                break;
-            if(mode->next == pScrn->modes) {
-                mode = NULL;
-                break;
-            }
-        }
-
-        pNv->BackendMode = mode;
-
-        if(mode)
-            xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "BackendMode: Using mode "
-                       "\"%s\" for display timings\n", mode->name);
-        else
-            xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Cannot honor "
-                       "\"BackendMode\" option: no mode named \"%s\" "
-                       "found.\n", s);
-    }
-
     /* Load fb */
     if(!xf86LoadSubModule(pScrn, "fb")) goto fail;
     xf86LoaderReqSymLists(fbSymbols, NULL);
@@ -405,8 +378,10 @@ AcquireDisplay(ScrnInfoPtr pScrn)
 
     if(!G80DispInit(pScrn))
         return FALSE;
+#if 0
     if(!G80CursorAcquire(pNv))
         return FALSE;
+#endif
     if(!G80DispSetMode(pScrn, pScrn->currentMode))
         return FALSE;
     G80DispDPMSSet(pScrn, DPMSModeOn, 0);
@@ -422,7 +397,9 @@ ReleaseDisplay(ScrnInfoPtr pScrn)
 {
     G80Ptr pNv = G80PTR(pScrn);
 
+#if 0
     G80CursorRelease(pNv);
+#endif
     G80DispShutdown(pScrn);
 
     if(pNv->int10 && pNv->int10Mode) {
@@ -450,8 +427,10 @@ G80CloseScreen(int scrnIndex, ScreenPtr pScreen)
 
     if(pNv->xaa)
         XAADestroyInfoRec(pNv->xaa);
+#if 0
     if(pNv->HWCursor)
         xf86DestroyCursorInfoRec(pNv->CursorInfo);
+#endif
 
     if(xf86ServerIsExiting()) {
         if(pNv->int10) xf86FreeInt10(pNv->int10);
@@ -792,11 +771,13 @@ G80ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
 
     /* Initialize hardware cursor.  Must follow software cursor initialization. */
+#if 0
     if(pNv->HWCursor && !G80CursorInit(pScreen)) {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                    "Hardware cursor initialization failed\n");
         pNv->HWCursor = FALSE;
     }
+#endif
 
     /* Initialize default colormap */
     if(!miCreateDefColormap(pScreen))
diff --git a/src/g80_type.h b/src/g80_type.h
index 39d737c..20b5e8b 100644
--- a/src/g80_type.h
+++ b/src/g80_type.h
@@ -49,7 +49,6 @@ typedef struct G80Rec {
     OptionInfoPtr       Options;
     Bool                HWCursor;
     Bool                NoAccel;
-    DisplayModePtr      BackendMode;
 
     /* Cursor */
     xf86CursorInfoPtr   CursorInfo;
-- 
cgit v1.2.3