diff options
| author | Egbert Eich <eich@freedesktop.org> | 2008-07-20 11:39:40 +0200 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2008-07-20 11:41:05 +0200 |
| commit | 8133d1a4a75727ad7d4aedb51a784c7b9d3caac8 (patch) | |
| tree | 2d160fe3ddea03fc968258d89f0d6e06176897e4 | |
| parent | f362e5abae77ad0872b334a8e105b1f03ed8495f (diff) | |
MC: Enable MC control for RS600, fixed segfault.
| -rw-r--r-- | src/rhd_mc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rhd_mc.c b/src/rhd_mc.c index de5bc4e..d67c194 100644 --- a/src/rhd_mc.c +++ b/src/rhd_mc.c @@ -503,10 +503,14 @@ rs780MCIdle(RHDPtr rhdPtr) Bool RHDMCIdle(RHDPtr rhdPtr, CARD32 count) { + struct rhdMC *MC = rhdPtr->MC; RHDFUNC(rhdPtr); + if (!MC) + return; + do { - if (rhdPtr->MC->MCIdle(rhdPtr)) + if (MC->MCIdle(rhdPtr)) return TRUE; usleep(10); } while (count--); @@ -590,10 +594,6 @@ RHDMCInit(RHDPtr rhdPtr) RHDDebug(rhdPtr->scrnIndex, "MC FB Address: 0x%08X.\n", rhdPtr->FbIntAddress); - /* we know nothing about RS600, yet */ - if (rhdPtr->ChipSet == RHD_RS600) - return; - MC = xnfcalloc(1, sizeof(struct rhdMC)); MC->Stored = FALSE; |