summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-02-05 13:37:20 +1000
committerDave Airlie <airlied@redhat.com>2010-02-05 13:37:20 +1000
commitb7ca1ab11ac0e4e4be5a1e7789ae8633b460a2d4 (patch)
tree1b97a528282a5e35da3a379c17329f941ffadb31
parent97c387e269672b146a95b45fbef5c8c18e473e36 (diff)
rs400/rs480: mc idle bit is bit 2 like original radeon
backport from a KMS fix, the rs400/480 mc idle is bit 2 not bit 4. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/radeon_driver.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 859a7099..c4d2ef5c 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -772,6 +772,12 @@ static Bool radeon_get_mc_idle(ScrnInfoPtr pScrn)
return TRUE;
else
return FALSE;
+ } else if ((info->ChipFamily == CHIP_FAMILY_RS400) ||
+ (info->ChipFamily == CHIP_FAMILY_RS480)) {
+ if (INREG(RADEON_MC_STATUS) & RADEON_MC_IDLE)
+ return TRUE;
+ else
+ return FALSE;
} else if (IS_R300_VARIANT) {
if (INREG(RADEON_MC_STATUS) & R300_MC_IDLE)
return TRUE;