File xf86-video-siliconmotion-1.7.3.dif of Package xorg-x11-driver-video

Index: src/smi.h
===================================================================
--- src/smi.h.orig
+++ src/smi.h
@@ -147,7 +147,13 @@ typedef struct
     int			Bpp;		/* Bytes per pixel */
     int			MCLK;		/* Memory Clock  */
     int			MXCLK;		/* MSOC Clock for local sdram */
-    ClockRanges		clockRange;	/* Allowed pixel clock range */
+    /*  ClockRanges		clockRange; */	/* Allowed pixel clock range */
+    /* ClockRanges was removed with xserver-1.8 */
+    int			minClock;
+    int			maxClock;
+    Bool                interlaceAllowed;
+    Bool		doubleScanAllowed;
+    /* end ClockRanges replacement */
     CloseScreenProcPtr	CloseScreen;	/* Pointer used to save wrapped
 					   CloseScreen function */
 
Index: src/smi_driver.c
===================================================================
--- src/smi_driver.c.orig
+++ src/smi_driver.c
@@ -807,18 +807,16 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags
      * Setup the ClockRanges, which describe what clock ranges are available,
      * and what sort of modes they can be used for.
      */
-    pSmi->clockRange.next = NULL;
-    pSmi->clockRange.minClock = 20000;
+    pSmi->minClock = 20000;
 
     if (SMI_LYNXM_SERIES(pSmi->Chipset) ||
 	IS_MSOC(pSmi))
-	pSmi->clockRange.maxClock = 200000;
+	pSmi->maxClock = 200000;
     else
-        pSmi->clockRange.maxClock = 135000;
+        pSmi->maxClock = 135000;
 
-    pSmi->clockRange.clockIndex = -1;
-    pSmi->clockRange.interlaceAllowed = FALSE;
-    pSmi->clockRange.doubleScanAllowed = FALSE;
+    pSmi->interlaceAllowed = FALSE;
+    pSmi->doubleScanAllowed = FALSE;
 
     if(!SMI_CrtcPreInit(pScrn))
 	LEAVE(FALSE);
Index: src/smi_output.c
===================================================================
--- src/smi_output.c.orig
+++ src/smi_output.c
@@ -71,10 +71,10 @@ SMI_OutputModeValid(xf86OutputPtr output
     if (mode->HDisplay & 15)
 	LEAVE(MODE_BAD_WIDTH);
 
-    if((mode->Clock < pSmi->clockRange.minClock) ||
-       (mode->Clock > pSmi->clockRange.maxClock) ||
-       ((mode->Flags & V_INTERLACE) && !pSmi->clockRange.interlaceAllowed) ||
-       ((mode->Flags & V_DBLSCAN) && (mode->VScan > 1) && !pSmi->clockRange.doubleScanAllowed)){
+    if((mode->Clock < pSmi->minClock) ||
+       (mode->Clock > pSmi->maxClock) ||
+       ((mode->Flags & V_INTERLACE) && !pSmi->interlaceAllowed) ||
+       ((mode->Flags & V_DBLSCAN) && (mode->VScan > 1) && !pSmi->doubleScanAllowed)){
 	LEAVE(MODE_CLOCK_RANGE);
     }
 
Index: src/smilynx_crtc.c
===================================================================
--- src/smilynx_crtc.c.orig
+++ src/smilynx_crtc.c
@@ -284,14 +284,14 @@ SMILynx_CrtcModeSet_vga(xf86CrtcPtr crtc
     if (SMI_LYNX_SERIES(pSmi->Chipset)) {
         SMI_CommonCalcClock(pScrn->scrnIndex, adjusted_mode->Clock,
 			1, 1, 63, 0, 3,
-                        pSmi->clockRange.minClock,
-                        pSmi->clockRange.maxClock,
+                        pSmi->minClock,
+                        pSmi->maxClock,
                         &reg->SR6C, &reg->SR6D);
     } else {
         SMI_CommonCalcClock(pScrn->scrnIndex, adjusted_mode->Clock,
 			1, 1, 63, 0, 1,
-                        pSmi->clockRange.minClock,
-                        pSmi->clockRange.maxClock,
+                        pSmi->minClock,
+                        pSmi->maxClock,
                         &reg->SR6C, &reg->SR6D);
     }
 
@@ -378,14 +378,14 @@ SMILynx_CrtcModeSet_crt(xf86CrtcPtr crtc
     if (SMI_LYNX_SERIES(pSmi->Chipset)) {
         SMI_CommonCalcClock(pScrn->scrnIndex, adjusted_mode->Clock,
 			1, 1, 63, 0, 3,
-                        pSmi->clockRange.minClock,
-                        pSmi->clockRange.maxClock,
+                        pSmi->minClock,
+                        pSmi->maxClock,
                         &reg->SR6C, &reg->SR6D);
     } else {
         SMI_CommonCalcClock(pScrn->scrnIndex, adjusted_mode->Clock,
 			1, 1, 63, 0, 1,
-                        pSmi->clockRange.minClock,
-                        pSmi->clockRange.maxClock,
+                        pSmi->minClock,
+                        pSmi->maxClock,
                         &reg->SR6C, &reg->SR6D);
     }
 
@@ -487,14 +487,14 @@ SMILynx_CrtcModeSet_lcd(xf86CrtcPtr crtc
     if (SMI_LYNX_SERIES(pSmi->Chipset)) {
         SMI_CommonCalcClock(pScrn->scrnIndex, adjusted_mode->Clock,
 			1, 1, 63, 0, 0,
-                        pSmi->clockRange.minClock,
-                        pSmi->clockRange.maxClock,
+                        pSmi->minClock,
+                        pSmi->maxClock,
                         &reg->SR6E, &reg->SR6F);
     } else {
         SMI_CommonCalcClock(pScrn->scrnIndex, adjusted_mode->Clock,
 			1, 1, 63, 0, 1,
-                        pSmi->clockRange.minClock,
-                        pSmi->clockRange.maxClock,
+                        pSmi->minClock,
+                        pSmi->maxClock,
                         &reg->SR6E, &reg->SR6F);
     }
 
Index: src/smilynx_hw.c
===================================================================
--- src/smilynx_hw.c.orig
+++ src/smilynx_hw.c
@@ -66,8 +66,8 @@ SMILynx_HWInit(ScrnInfoPtr pScrn)
     if (pSmi->MCLK > 0)
 	SMI_CommonCalcClock(pScrn->scrnIndex, pSmi->MCLK,
 			    1, 1, 63, 0, 0,
-			    pSmi->clockRange.minClock,
-			    pSmi->clockRange.maxClock,
+			    pSmi->minClock,
+			    pSmi->maxClock,
 			    &mode->SR6A, &mode->SR6B);
 
     if(!pSmi->useBIOS) {