rpms/xorg-x11-drv-nv/devel nv-reserve-fbarea.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.60, 1.61

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16314

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-reserve-fbarea.patch 
Log Message:
* Fri Jan 18 2008 Dave Airlie <ajax at redhat.com> 2.1.6-4
- Fixup fb vs XAA alignment


nv-reserve-fbarea.patch:

--- NEW FILE nv-reserve-fbarea.patch ---
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 4bcc391..0cc1f00 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -32,6 +32,8 @@
 #include "xf86int10.h"
 #include "vbeModes.h"
 
+#define NV_ALIGN(x,bytes) (((x) + ((bytes) - 1)) & ~((bytes) - 1))
+
 const   OptionInfoRec * RivaAvailableOptions(int chipid, int busid);
 Bool    RivaGetScrnInfoRec(PciChipsets *chips, int chip);
 Bool    G80GetScrnInfoRec(PciChipsets *chips, int chip);
@@ -2266,7 +2268,7 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     unsigned char *FBStart;
     int width, height, displayWidth, offscreenHeight, shadowHeight;
     BoxRec AvailFBArea;
-
+    FBAreaPtr fbarea;
     /* 
      * First get the ScrnInfoRec
      */
@@ -2421,7 +2423,30 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     AvailFBArea.y1 = 0;
     AvailFBArea.x2 = pScrn->displayWidth;
     AvailFBArea.y2 = offscreenHeight;
-    xf86InitFBManager(pScreen, &AvailFBArea);
+
+
+    if (!xf86InitFBManager(pScreen, &AvailFBArea)) {
+	xf86DrvMsg(scrnIndex, X_ERROR,
+		   "Memory manager initialized to (%d,%d) (%d,%d)  failed\n",
+		   AvailFBArea.x1, AvailFBArea.y1, AvailFBArea.x2, AvailFBArea.y2);
+	return FALSE;
+    }
+
+    xf86DrvMsg(scrnIndex, X_INFO,
+	       "Memory manager initialized to (%d,%d) (%d,%d)\n",
+	       AvailFBArea.x1, AvailFBArea.y1, AvailFBArea.x2, AvailFBArea.y2);
+    
+    if ((fbarea = xf86AllocateOffscreenArea(pScreen,
+					    pScrn->displayWidth,
+					    NV_ALIGN(pScrn->virtualY, 64),
+					    0, NULL, NULL, NULL))) {
+	xf86DrvMsg(scrnIndex, X_INFO,
+		   "Reserved area from (%d,%d) to (%d,%d)\n",
+		   fbarea->box.x1, fbarea->box.y1,
+		   fbarea->box.x2, fbarea->box.y2);
+    } else {
+	xf86DrvMsg(scrnIndex, X_ERROR, "Unable to reserve area\n");
+    }
     
     if (!pNv->NoAccel)
 	NVAccelInit(pScreen);


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xorg-x11-drv-nv.spec	9 Jan 2008 16:51:07 -0000	1.60
+++ xorg-x11-drv-nv.spec	18 Jan 2008 05:19:28 -0000	1.61
@@ -9,7 +9,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.6
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -34,6 +34,7 @@
 Patch1:     nouveau-fix-bswap32.patch
 Patch2:	    nv-2.1.6-alloca.patch
 Patch3:     nouveau-alloca.patch
+Patch4:     nv-reserve-fbarea.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -52,6 +53,7 @@
 # disable for now, needs porting to pciaccess
 #patch0 -p1 -b .nv34-tweak
 %patch2 -p1 -b .alloca
+%patch4 -p1 -b .reserve-fbarea
 
 pushd ..
 tar jxf %{SOURCE1}
@@ -99,6 +101,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Fri Jan 18 2008 Dave Airlie <ajax at redhat.com> 2.1.6-4
+- Fixup fb vs XAA alignment
+
 * Wed Jan 09 2008 Adam Jackson <ajax at redhat.com> 2.1.6-3
 - Rebuild yet again for new server ABI.