From 8cd5a465a03834b4b2f3a19f8d36fc9d2e18c6d4 Mon Sep 17 00:00:00 2001
From: George Sapountzis <gsap7@yahoo.gr>
Date: Fri, 8 Feb 2008 19:06:27 +0200
Subject: mach64: minor cosmetic, DAC type

---
 src/atipreinit.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/atipreinit.c')

diff --git a/src/atipreinit.c b/src/atipreinit.c
index 8c67932f..0b0e8ad9 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -654,8 +654,6 @@ ATIPreInit
 #endif /* AVOID_CPIO */
 
     /* Finish private area initialisation */
-    pATI->DAC = ATI_DAC_GENERIC;
-
     pATI->LCDPanelID = -1;
     pATI->nFIFOEntries = 16;                    /* For now */
 
@@ -737,8 +735,6 @@ ATIPreInit
                     pATI->VideoRAM = (IOValue - 7) * 2048;
             }
 
-            pATI->DAC = GetBits(inr(DAC_CNTL), DAC_TYPE);
-
             IOValue = inr(CONFIG_STATUS64_0);
             if (pATI->Chip >= ATI_CHIP_264CT)
             {
@@ -814,7 +810,13 @@ ATIPreInit
             else
             {
                 pATI->MemoryType = GetBits(IOValue, CFG_MEM_TYPE);
+            }
 
+            /* Get DAC type */
+            pATI->DAC = GetBits(inr(DAC_CNTL), DAC_TYPE);
+
+            if (pATI->Chip < ATI_CHIP_264CT)
+            {
                 /* Factor in what the BIOS says the DAC is */
                 pATI->DAC = ATI_DAC(pATI->DAC,
                     GetBits(inr(SCRATCH_REG1), BIOS_INIT_DAC_SUBTYPE));
-- 
cgit v1.2.3