summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-09-09 19:17:05 -0700
committerEric Anholt <eric@anholt.net>2008-09-09 19:17:05 -0700
commit0f804bfa1e1e972e9b4e3b7c8db61e9877c50f50 (patch)
tree338c16611e207e555ab214a34a6902b97daf82a9
parentda63b5adec8555cc7b3e71f33933f4c9dd6f714e (diff)
Bug #17446: Don't try to manage IRQs in GEM mode.
The kernel told us that it was already doing so, resulting in failure.
-rw-r--r--src/i830_driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 1a50d7bd..b9705cf2 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3702,8 +3702,8 @@ I830EnterVT(int scrnIndex, int flags)
/* HW status is fixed, we need to set it up before any drm
* operation which accessing that page, like irq install, etc.
*/
- if (pI830->starting) {
- if (pI830->hw_status != NULL && !I830DRISetHWS(pScrn)) {
+ if (pI830->starting && !pI830->memory_manager) {
+ if (!I830DRISetHWS(pScrn)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Fail to setup hardware status page.\n");
I830DRICloseScreen(pScrn->pScreen);