summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/radeon_crtc.c2
-rw-r--r--src/radeon_driver.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index ca554d28..46377632 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -311,7 +311,7 @@ RADEONInitCrtcRegisters(xf86CrtcPtr crtc, RADEONSavePtr save,
return FALSE;
}
- save->bios_4_scratch = info->SavedReg.bios_4_scratch;
+ /*save->bios_4_scratch = info->SavedReg.bios_4_scratch;*/
save->crtc_gen_cntl = (RADEON_CRTC_EXT_DISP_EN
| RADEON_CRTC_EN
| (format << 8)
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 10223f4e..40e1d987 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4251,6 +4251,8 @@ void RADEONRestoreBIOSRegisters(ScrnInfoPtr pScrn, RADEONSavePtr restore)
OUTREG(RADEON_BIOS_5_SCRATCH, restore->bios_5_scratch);
if (restore->bios_6_scratch & 0x40000000)
bios_6_scratch |= 0x40000000;
+ else
+ bios_6_scratch &= ~0x40000000;
OUTREG(RADEON_BIOS_6_SCRATCH, bios_6_scratch);
}