From 32f2119b43a0faf6069d8cc0816f0d9f7914c07f Mon Sep 17 00:00:00 2001
From: Alex Deucher <alex@cube.(none)>
Date: Tue, 12 Feb 2008 14:20:02 -0500
Subject: R6xx: bios scratch regs moved.

---
 src/radeon_driver.c |  3 +++
 src/radeon_output.c | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 50343d2..3ba7ce8 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2988,6 +2988,9 @@ RADEONInitBIOSRegisters(ScrnInfoPtr pScrn)
     unsigned char *RADEONMMIO = info->MMIO;
     RADEONSavePtr save = info->ModeReg;
 
+    if (info->ChipFamily >= CHIP_FAMILY_R600)
+	return;
+
     save->bios_0_scratch = info->SavedReg->bios_0_scratch;
     save->bios_1_scratch = info->SavedReg->bios_1_scratch;
     save->bios_2_scratch = info->SavedReg->bios_2_scratch;
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 7d73fa8..4194654 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -665,6 +665,9 @@ radeon_bios_output_lock(xf86OutputPtr output, Bool lock)
     unsigned char *RADEONMMIO = info->MMIO;
     RADEONSavePtr save = info->ModeReg;
 
+    if (info->ChipFamily >= CHIP_FAMILY_R600)
+	return;
+
     if (info->IsAtomBios) {
 	if (lock) {
 	    save->bios_6_scratch |= (ATOM_S6_CRITICAL_STATE | ATOM_S6_ACC_MODE);
@@ -690,6 +693,9 @@ radeon_bios_output_dpms(xf86OutputPtr output, int mode)
     unsigned char *RADEONMMIO = info->MMIO;
     RADEONSavePtr save = info->ModeReg;
 
+    if (info->ChipFamily >= CHIP_FAMILY_R600)
+	return;
+
     if (info->IsAtomBios) {
 	if (mode == DPMSModeOn) {
 	    if (radeon_output->MonType == MT_STV ||
@@ -832,6 +838,9 @@ radeon_bios_output_crtc(xf86OutputPtr output)
     xf86CrtcPtr crtc = output->crtc;
     RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
 
+    if (info->ChipFamily >= CHIP_FAMILY_R600)
+	return;
+
     if (info->IsAtomBios) {
 	if (radeon_output->MonType == MT_STV ||
 	    radeon_output->MonType == MT_CTV) {
@@ -908,6 +917,9 @@ radeon_bios_output_connected(xf86OutputPtr output, Bool connected)
     unsigned char *RADEONMMIO = info->MMIO;
     RADEONSavePtr save = info->ModeReg;
 
+    if (info->ChipFamily >= CHIP_FAMILY_R600)
+	return;
+
     if (info->IsAtomBios) {
 	if (connected) {
 	    if (radeon_output->MonType == MT_STV) {
-- 
cgit v1.2.3