remove "PPCFPHack" option which turned out not to be necessaryppc-1-0-0-branch

2 files changed, 10 insertions, 22 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h
index 5c5db22cd..e945d66bf 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h
@@ -198,7 +198,6 @@ typedef struct {
     Bool              CRTOnly;      /* Only use External CRT instead of FP   */
     CARD8             *VBIOS;       /* Video BIOS for mode validation on FPs */
     int               FPBIOSstart;  /* Start of the flat panel info          */
-    Bool              PPCFPHack;    /* Don't use the FP registers on the PPC */
 
 				/* Computed values for FPs */
     int               PanelXRes;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c
index 15f227c4e..dc86ef3c4 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c
@@ -246,7 +246,6 @@ static OptionInfoRec R128Options[] = {
   { OPTION_PANEL_WIDTH,  "PanelWidth",       OPTV_INTEGER, {0}, FALSE },
   { OPTION_PANEL_HEIGHT, "PanelHeight",      OPTV_INTEGER, {0}, FALSE },
   { OPTION_PROG_FP_REGS, "ProgramFPRegs",    OPTV_BOOLEAN, {0}, FALSE },
-  { OPTION_PPCFPHACK,    "PPCFPHack",        OPTV_BOOLEAN, {0}, FALSE },
   { OPTION_FBDEV,        "UseFBDev",         OPTV_BOOLEAN, {0}, FALSE },
   { -1,                  NULL,               OPTV_NONE,    {0}, FALSE }
 };
@@ -681,7 +680,7 @@ static Bool R128GetBIOSParameters(ScrnInfoPtr pScrn)
 		   "Video BIOS not found!\n");
     }
 
-    if (info->VBIOS && info->HasPanelRegs && !info->PPCFPHack) {
+    if (info->VBIOS && info->HasPanelRegs) {
 	info->FPBIOSstart = 0;
 
 	/* FIXME: There should be direct access to the start of the FP info
@@ -1166,20 +1165,10 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn)
 
 				/* Flat panel (part 2) */
     if (info->HasPanelRegs) {
-	if ((info->PPCFPHack = xf86ReturnOptValBool(R128Options,
-						    OPTION_PPCFPHACK,
-						    FALSE))) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
-		       "Using the PPC flat panel hack\n");
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		       "\n\nWARNING: Using the PPC flat panel hack might damage your flat panel.\nUse at your *OWN* *RISK*.\n\n");
-	}
-
 #if 1
 	info->CRTOnly = FALSE;
-	if (!info->PPCFPHack)
-		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		   "Using flat panel for display\n");
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	   "Using flat panel for display\n");
 #else
 	if ((info->CRTOnly = xf86ReturnOptValBool(R128Options,
 						  OPTION_CRT, FALSE))) {
@@ -1196,7 +1185,7 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn)
 	info->CRTOnly = FALSE;
     }
 
-    if (info->HasPanelRegs && !info->PPCFPHack) {
+    if (info->HasPanelRegs) {
 	info->PanelXRes = 0;
 	info->PanelYRes = 0;
 	if (xf86GetOptValInteger(R128Options,
@@ -2279,9 +2268,9 @@ static void R128RestoreMode(ScrnInfoPtr pScrn, R128SavePtr restore)
     R128TRACE(("R128RestoreMode(%p)\n", restore));
     R128RestoreCommonRegisters(pScrn, restore);
     R128RestoreCrtcRegisters(pScrn, restore);
-    if (info->HasPanelRegs && !info->PPCFPHack)
+    if (info->HasPanelRegs)
 	R128RestoreFPRegisters(pScrn, restore);
-    if (!info->HasPanelRegs || info->CRTOnly || info->PPCFPHack)
+    if (!info->HasPanelRegs || info->CRTOnly)
 	R128RestorePLLRegisters(pScrn, restore);
     R128RestoreDDARegisters(pScrn, restore);
     R128RestorePalette(pScrn, restore);
@@ -2393,7 +2382,7 @@ static void R128SaveMode(ScrnInfoPtr pScrn, R128SavePtr save)
 
     R128SaveCommonRegisters(pScrn, save);
     R128SaveCrtcRegisters(pScrn, save);
-    if (info->HasPanelRegs && !info->PPCFPHack)
+    if (info->HasPanelRegs)
 	R128SaveFPRegisters(pScrn, save);
     R128SavePLLRegisters(pScrn, save);
     R128SaveDDARegisters(pScrn, save);
@@ -2516,7 +2505,7 @@ static Bool R128InitCrtcRegisters(ScrnInfoPtr pScrn, R128SavePtr save,
     }
     R128TRACE(("Format = %d (%d bytes per pixel)\n", format, bytpp));
 
-    if (info->HasPanelRegs && !info->PPCFPHack)
+    if (info->HasPanelRegs)
 	if (info->CRTOnly) hsync_fudge = hsync_fudge_fp_crt[format-1];
 	else               hsync_fudge = hsync_fudge_fp[format-1];
     else                   hsync_fudge = hsync_fudge_default[format-1];
@@ -2856,7 +2845,7 @@ static Bool R128Init(ScrnInfoPtr pScrn, DisplayModePtr mode, R128SavePtr save)
 
     R128InitCommonRegisters(save, mode, info);
     if (!R128InitCrtcRegisters(pScrn, save, mode, info)) return FALSE;
-    if (info->HasPanelRegs && !info->PPCFPHack)
+    if (info->HasPanelRegs)
 	R128InitFPRegisters(pScrn, &info->SavedReg, save, mode, info);
     R128InitPLLRegisters(pScrn, save, mode, &info->pll, dot_clock);
     if (!R128InitDDARegisters(pScrn, save, mode, &info->pll, info))
@@ -2919,7 +2908,7 @@ static int R128ValidMode(int scrnIndex, DisplayModePtr mode,
 	if (mode->Flags & V_DBLSCAN)   return MODE_NO_DBLESCAN;
     }
 
-    if (info->HasPanelRegs && !info->PPCFPHack && !info->CRTOnly && info->VBIOS) {
+    if (info->HasPanelRegs && !info->CRTOnly && info->VBIOS) {
 	int i;
 	for (i = info->FPBIOSstart+64; R128_BIOS16(i) != 0; i += 2) {
 	    int j = R128_BIOS16(i);