Minor refactoring of module (un)loading for TV_OUT.

3 files changed, 26 insertions, 35 deletions

diff --git a/src/atimach64.c b/src/atimach64.c
index 24da669..98eb894 100644
--- a/src/atimach64.c
+++ b/src/atimach64.c
@@ -646,15 +646,16 @@ ATIMach64Calculate
     {
         pMode->Flags &= ~(V_PHSYNC | V_NHSYNC | V_PVSYNC | V_NVSYNC);
 
-        if (pATI->OptionPanelDisplay && (pATI->LCDPanelID >= 0)
-#ifdef TV_OUT
-       && !pATI->tvActive
-#endif
-)
+        if (pATI->OptionPanelDisplay && (pATI->LCDPanelID >= 0))
             VDisplay = pATI->LCDVertical;
         else
             VDisplay = pMode->CrtcVDisplay;
 
+#ifdef TV_OUT
+        if (pATI->tvActive)
+            VDisplay = pMode->CrtcVDisplay;
+#endif
+
         if (VDisplay < 400)
             pMode->Flags |= V_PHSYNC | V_NVSYNC;
         else if (VDisplay < 480)
diff --git a/src/atimode.c b/src/atimode.c
index 227eea2..d455404 100644
--- a/src/atimode.c
+++ b/src/atimode.c
@@ -741,16 +741,17 @@ ATIModeCalculate
             MaxScalerClock = 80000;     /* Conservative */
         pATIHW->pll_vclk_cntl &= ~PLL_ECP_DIV;
 #ifdef TV_OUT
-	if (!pATI->OptionTvOut) {
-#endif /* TV_OUT */
+	if (pATI->OptionTvOut) {
 	   /* XXX Don't do this for TVOut! */
+	}
+	else
+#endif /* TV_OUT */
+	{
 	   ECPClock = pMode->SynthClock;
 	   for (Index = 0;  (ECPClock > MaxScalerClock) && (Index < 2);  Index++)
 	      ECPClock >>= 1;
 	   pATIHW->pll_vclk_cntl |= SetBits(Index, PLL_ECP_DIV);
-#ifdef TV_OUT
 	}
-#endif /* TV_OUT */
     }
     else if (pATI->DAC == ATI_DAC_IBMRGB514)
     {
diff --git a/src/atipreinit.c b/src/atipreinit.c
index b525918..cb5ba13 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -178,7 +178,7 @@ ATIPreInit
 #ifndef AVOID_CPIO
 
     xf86Int10InfoPtr pInt10Info = NULL;
-    vbeInfoPtr       pVBE;
+    vbeInfoPtr       pVBE = NULL;
     pointer          pInt10Module, pDDCModule = NULL, pVBEModule = NULL;
 
 #endif /* AVOID_CPIO */
@@ -301,14 +301,7 @@ ATIPreInit
         ATIProcessOptions(pScreenInfo, pATI);
     }
 
-#ifdef AVOID_CPIO
-
-    else /* if (flags & PROBE_DETECT) */
-    {
-        return TRUE;
-    }
-
-#else /* AVOID_CPIO */
+#ifndef AVOID_CPIO
 
 #ifdef TV_OUT
 
@@ -349,17 +342,7 @@ ATIPreInit
             if ((pVBE = VBEInit(pInt10Info, pATI->iEntity)))
             {
                 ConfiguredMonitor = vbeDoEDID(pVBE, pDDCModule);
-#ifdef TV_OUT
-		pATI->pInt10 = pInt10Info;
-		pATI->pVBE = pVBE;
-		pVBE = NULL;
-#else
-                vbeFree(pVBE);
-#endif /* TV_OUT */
             }
-#ifndef TV_OUT
-            xf86UnloadSubModule(pVBEModule);
-#endif /* TV_OUT */
         }
 
         if (!(flags & PROBE_DETECT))
@@ -383,20 +366,21 @@ ATIPreInit
     }
 
 #ifndef TV_OUT
+    /* De-activate VBE */
+    vbeFree(pVBE);
+    xf86UnloadSubModule(pVBEModule);
+
     /* De-activate int10 */
     xf86FreeInt10(pInt10Info);
     xf86UnloadSubModule(pInt10Module);
 #else
+    pATI->pInt10 = pInt10Info;
+    pATI->pVBE = pVBE;
+    pVBE = NULL;
     pInt10Info = NULL;
 #endif /* TV_OUT */
 
-    if (flags & PROBE_DETECT)
-    {
-        xf86UnloadSubModule(pDDCModule);
-        return TRUE;
-    }
-
-    if (ConfiguredMonitor)
+    if (ConfiguredMonitor && !(flags & PROBE_DETECT))
     {
         xf86PrintEDID(ConfiguredMonitor);
         xf86SetDDCproperties(pScreenInfo, ConfiguredMonitor);
@@ -407,6 +391,11 @@ ATIPreInit
 
 #endif /* AVOID_CPIO */
 
+    if (flags & PROBE_DETECT)
+    {
+        return TRUE;
+    }
+
     pATI->Block0Base = 0;       /* Might no longer be valid */
     if ((pVideo = pATI->PCIInfo))
     {