summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Sapountzis <gsap7@yahoo.gr>2008-02-08 19:06:27 +0200
committerGeorge Sapountzis <gsap7@yahoo.gr>2008-02-08 19:06:27 +0200
commit8cd5a465a03834b4b2f3a19f8d36fc9d2e18c6d4 (patch)
treea780784f483b5fab30d913306dfce9288b613cc8 /src
parent7f4db96123fdcba9874226352802d702c2a498bd (diff)
mach64: minor cosmetic, DAC type
Diffstat (limited to 'src')
-rw-r--r--src/atipreinit.c10
1 files changed, 6 insertions, 4 deletions
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));