rpms/xorg-x11-drv-i810/devel intel-fix-irq.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.102, 1.103

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31676

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-fix-irq.patch 
Log Message:
* Wed Sep 03 2008 Dave Airlie <airlied at redhat.com> 2.4.2-3
- intel-fix-irq.patch - Don't die on irq handler failure
- I think krh DRI2 patches broke it.


intel-fix-irq.patch:

--- NEW FILE intel-fix-irq.patch ---
diff --git a/src/i830_dri.c b/src/i830_dri.c
index ca3bc62..9333651 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -921,7 +921,8 @@ I830DRIInstIrqHandler(ScrnInfoPtr pScrn)
        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 	       "[drm] failure adding irq handler\n");
        pI830DRI->irq = 0;
-       return FALSE;
+	/* don't fail on irq handler install */
+       return TRUE;
    } else
        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 	       "[drm] dma control initialized, using IRQ %d\n",


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- xorg-x11-drv-i810.spec	31 Aug 2008 07:32:22 -0000	1.102
+++ xorg-x11-drv-i810.spec	3 Sep 2008 09:00:06 -0000	1.103
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -23,6 +23,7 @@
 Patch1: intel-2.4.2-git-diffs.patch
 Patch3: intel-2.1.1-fix-xv-reset.patch
 Patch4: intel-fix-flip.patch
+Patch5: intel-fix-irq.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -55,6 +56,7 @@
 %patch1 -p1 -b .gitupdate
 %patch3 -p1 -b .xvfix
 %patch4 -p1 -b .fixflip
+%patch5 -p1 -b .irqfix
 
 %build
 
@@ -97,6 +99,10 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Wed Sep 03 2008 Dave Airlie <airlied at redhat.com> 2.4.2-3
+- intel-fix-irq.patch - Don't die on irq handler failure
+- I think krh DRI2 patches broke it.
+
 * Thu Aug 28 2008 Dave Airlie <airlied at redhat.com> 2.4.2-2
 - upgrade to git head - brings in modesetting + GEM bits - fix flip