rpms/xorg-x11-drv-i810/devel i830-render-init-no-map.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.103, 1.104

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	i830-render-init-no-map.patch 
Log Message:
* Mon Sep 08 2008 Dave Airlie <airlied at redhat.com> 2.4.2-4
- Add patch from fd.o bug 17341 to fix problems on intel EXA


i830-render-init-no-map.patch:

--- NEW FILE i830-render-init-no-map.patch ---
diff --git a/src/i965_render.c b/src/i965_render.c
index a4334c6..7dee5f3 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -1450,7 +1450,7 @@ gen4_render_state_init(ScrnInfoPtr pScrn)
 
     render_state->card_state_offset = pI830->gen4_render_state_mem->offset;
 
-    if (pI830->gen4_render_state_mem->bo) {
+    if (pI830->use_drm_mode) {
 	ret = dri_bo_map(pI830->gen4_render_state_mem->bo, 1);
 	if (ret) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
@@ -1474,7 +1474,7 @@ gen4_render_state_cleanup(ScrnInfoPtr pScrn)
 {
     I830Ptr pI830 = I830PTR(pScrn);
 
-    if (pI830->gen4_render_state_mem->bo) {
+    if (pI830->use_drm_mode) {
 	dri_bo_unmap(pI830->gen4_render_state_mem->bo);
 	dri_bo_unreference(pI830->gen4_render_state_mem->bo);
     }


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.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- xorg-x11-drv-i810.spec	3 Sep 2008 09:00:06 -0000	1.103
+++ xorg-x11-drv-i810.spec	8 Sep 2008 05:15:38 -0000	1.104
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -24,6 +24,8 @@
 Patch3: intel-2.1.1-fix-xv-reset.patch
 Patch4: intel-fix-flip.patch
 Patch5: intel-fix-irq.patch
+# fd.o bug 17341
+Patch6: i830-render-init-no-map.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -57,6 +59,7 @@
 %patch3 -p1 -b .xvfix
 %patch4 -p1 -b .fixflip
 %patch5 -p1 -b .irqfix
+%patch6 -p1 -b .exafix
 
 %build
 
@@ -99,6 +102,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Mon Sep 08 2008 Dave Airlie <airlied at redhat.com> 2.4.2-4
+- Add patch from fd.o bug 17341 to fix problems on intel EXA
+
 * 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.