[Intel-gfx] [PATCH] Don't install irq handler for GEM

[Zhenyu Wang]

On 2008.10.15 14:53:41 +0800, Zhenyu Wang wrote:
> From 2f4c5b261dd6d5c67fbd2e8dfc2bc9ce8f95e662 Mon Sep 17 00:00:00 2001
> From: Zhenyu Wang <zhenyu.z.wang at intel.com>
> Date: Wed, 15 Oct 2008 23:10:20 +0800
> Subject: [PATCH] Don't install irq handler for GEM
> 
> GEM's entervt/leavevt already handle that.
> ---

We might not touch irq in LeaveVT too. Updated one.

From a78dca129a10a5824c91944c3503e9c3bffc375b Mon Sep 17 00:00:00 2001
From: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Thu, 16 Oct 2008 10:35:17 +0800
Subject: [PATCH] Don't handle irq for GEM

---
 src/i830_dri.c    |    4 +++-
 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 fb9b6f6..bf64fa3 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 eaf5d27..2e503af 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
 
-- 
1.5.6.5


-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20081016/1e063380/attachment.sig>