xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 src/radeon.h        |    4 ---
 src/radeon_crtc.c   |    1 
 src/radeon_driver.c |   59 +++++++---------------------------------------------
 3 files changed, 9 insertions(+), 55 deletions(-)

New commits:
diff-tree dc333884c540d536bffe51a5ebfaf1822af6a91c (from 271e541088f455d1cfedff87e88c9a4fdbdbe424)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Tue Sep 18 22:23:12 2007 -0400

    RADEON: fix plls again
    
    previous fix seemed to break other chips.  Lets see how
    this goes.

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index 042d14b..47e46f3 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -862,7 +862,6 @@ radeon_crtc_mode_set(xf86CrtcPtr crtc, D
 		case 1:
 		    RADEONAdjustCrtc2RegistersForTV(pScrn, &info->ModeReg, adjusted_mode, output);
 		    RADEONAdjustPLL2RegistersForTV(pScrn, &info->ModeReg, adjusted_mode, output);
-		    update_tv_routing = TRUE;
 		    break;
 		}
 	    }
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index eb2d579..5c37488 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4661,7 +4661,10 @@ void RADEONRestorePLLRegisters(ScrnInfoP
     OUTPLLP(pScrn, RADEON_VCLK_ECP_CNTL,
 	    RADEON_VCLK_SRC_SEL_PPLLCLK,
 	    ~(RADEON_VCLK_SRC_SEL_MASK));
-    /*OUTPLL(pScrn, RADEON_VCLK_ECP_CNTL, restore->vclk_ecp_cntl);*/
+
+    usleep(50000);
+
+    OUTPLL(pScrn, RADEON_VCLK_ECP_CNTL, restore->vclk_ecp_cntl);
 
     ErrorF("finished PLL1\n");
 
@@ -4735,7 +4738,10 @@ void RADEONRestorePLL2Registers(ScrnInfo
     OUTPLLP(pScrn, RADEON_PIXCLKS_CNTL,
 	    RADEON_PIX2CLK_SRC_SEL_P2PLLCLK,
 	    ~(RADEON_PIX2CLK_SRC_SEL_MASK));
-    /*OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, restore->pixclks_cntl);*/
+
+    usleep(5000);
+
+    OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, restore->pixclks_cntl);
 
     ErrorF("finished PLL2\n");
 
diff-tree 271e541088f455d1cfedff87e88c9a4fdbdbe424 (from 8ae69c496eba701e744cca0605f73242673f7b3f)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Tue Sep 18 22:12:31 2007 -0400

    RADEON: Remove more mergedfb cruft

diff --git a/src/radeon.h b/src/radeon.h
index a1e7395..784fbc9 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -148,7 +148,6 @@ typedef enum {
     OPTION_REVERSE_DDC,
     OPTION_LVDS_PROBE_PLL,
     OPTION_ACCELMETHOD,
-    OPTION_CONSTANTDPI,
     OPTION_CONNECTORTABLE,
     OPTION_DRI,
     OPTION_DEFAULT_CONNECTOR_TABLE,
@@ -787,9 +786,6 @@ typedef struct {
 
     DisplayModePtr currentMode, savedCurrentMode;
 
-    int			constantDPI; /* -1 = auto, 0 = off, 1 = on */
-    int			RADEONDPIVX, RADEONDPIVY;
-
     /* special handlings for DELL triple-head server */
     Bool		IsDellServer; 
 
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 8a113fd..eb2d579 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -183,7 +183,6 @@ static const OptionInfoRec RADEONOptions
     { OPTION_REVERSE_DDC,    "ReverseDDC",       OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_LVDS_PROBE_PLL, "LVDSProbePLL",     OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_ACCELMETHOD,    "AccelMethod",      OPTV_STRING,  {0}, FALSE },
-    { OPTION_CONSTANTDPI,    "ConstantDPI",	 OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_DRI,            "DRI",       	 OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_CONNECTORTABLE, "ConnectorTable",   OPTV_STRING,  {0}, FALSE },
     { OPTION_DEFAULT_CONNECTOR_TABLE, "DefaultConnectorTable", OPTV_BOOLEAN, {0}, FALSE },
@@ -2511,7 +2510,6 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr
     xf86Int10InfoPtr  pInt10 = NULL;
     void *int10_save = NULL;
     const char *s;
-    MessageType from;
     int crtc_max_X, crtc_max_Y;
 
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
@@ -2647,25 +2645,6 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr
 	    info->DispPriority = 1; 
     }
 
-    info->constantDPI = -1;
-    from = X_DEFAULT;
-    if (xf86GetOptValBool(info->Options, OPTION_CONSTANTDPI, &info->constantDPI)) {
-       from = X_CONFIG;
-    } else {
-       if (monitorResolution > 0) {
-	  info->constantDPI = TRUE;
-	  from = X_CMDLINE;
-	  xf86DrvMsg(pScrn->scrnIndex, from,
-		"\"-dpi %d\" given in command line, assuming \"ConstantDPI\" set\n",
-		monitorResolution);
-       } else {
-	  info->constantDPI = FALSE;
-       }
-    }
-    xf86DrvMsg(pScrn->scrnIndex, from,
-	"X server will %skeep DPI constant for all screen sizes\n",
-	info->constantDPI ? "" : "not ");
-
     if (!RADEONPreInitInt10(pScrn, &pInt10))
 	goto fail;
 
@@ -5451,26 +5430,6 @@ static Bool RADEONSaveScreen(ScreenPtr p
     return TRUE;
 }
 
-static void
-RADEONResetDPI(ScrnInfoPtr pScrn, Bool force)
-{
-    RADEONInfoPtr info = RADEONPTR(pScrn);
-    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-
-    if(force					||
-       (info->RADEONDPIVX != pScrn->virtualX)	||
-       (info->RADEONDPIVY != pScrn->virtualY)
-					  ) {
-
-       pScreen->mmWidth = (pScrn->virtualX * 254 + pScrn->xDpi * 5) / (pScrn->xDpi * 10);
-       pScreen->mmHeight = (pScrn->virtualY * 254 + pScrn->yDpi * 5) / (pScrn->yDpi * 10);
-
-       info->RADEONDPIVX = pScrn->virtualX;
-       info->RADEONDPIVY = pScrn->virtualY;
-
-    }
-}
-
 Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 {
     ScrnInfoPtr    pScrn       = xf86Screens[scrnIndex];
@@ -5528,13 +5487,7 @@ Bool RADEONSwitchMode(int scrnIndex, Dis
     }
 #endif
 
-    /* Since RandR (indirectly) uses SwitchMode(), we need to
-     * update our Xinerama info here, too, in case of resizing
-     */
-    if(info->constantDPI) {
-       RADEONResetDPI(pScrn, FALSE);
-    }
-
+    /* reset ecp for overlay */
     info->ecp_div = -1;
 
     return ret;