diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-10-16 10:35:17 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-10-16 11:18:06 +0800 |
| commit | 871728a0cbba12579c830e67020cc0c69c1611bb (patch) | |
| tree | ae57f4195a7ad35038a31884828befaa31c1681e | |
| parent | 2419bce9efbff63529074e64af5ec5c2e62e368b (diff) | |
Don't handle irq in GEM mode
| -rw-r--r-- | src/i830_dri.c | 4 | ||||
| -rw-r--r-- | src/i830_driver.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c index fb9b6f63..bf64fa32 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -939,12 +939,14 @@ Bool I830DRIResume(ScreenPtr pScreen) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + I830Ptr pI830 = I830PTR(pScrn); DPRINTF(PFX, "I830DRIResume\n"); I830ResumeDma(pScrn); - I830DRIInstIrqHandler(pScrn); + if (!pI830->memory_manager) + I830DRIInstIrqHandler(pScrn); return TRUE; } diff --git a/src/i830_driver.c b/src/i830_driver.c index eaf5d27b..2e503afd 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -3546,8 +3546,10 @@ I830LeaveVT(int scrnIndex, int flags) if (pI830->directRenderingOpen) { DRILock(screenInfo.screens[pScrn->scrnIndex], 0); - I830DRISetVBlankInterrupt (pScrn, FALSE); - drmCtlUninstHandler(pI830->drmSubFD); + if (!pI830->memory_manager) { + I830DRISetVBlankInterrupt (pScrn, FALSE); + drmCtlUninstHandler(pI830->drmSubFD); + } } #endif |