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

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	nv-reserve-fbarea.patch xorg-x11-drv-nv.spec 
Log Message:
* Fri Jan 18 2008 Dave Airlie <airlied at redhat.com> 2.1.6-5
- fixup the fixup for fb vs XAA alignment


nv-reserve-fbarea.patch:

Index: nv-reserve-fbarea.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/nv-reserve-fbarea.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nv-reserve-fbarea.patch	18 Jan 2008 05:19:28 -0000	1.1
+++ nv-reserve-fbarea.patch	18 Jan 2008 05:46:19 -0000	1.2
@@ -1,5 +1,5 @@
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 4bcc391..0cc1f00 100644
+index 4bcc391..6252dd2 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -32,6 +32,8 @@
@@ -20,7 +20,7 @@
      /* 
       * First get the ScrnInfoRec
       */
-@@ -2421,7 +2423,30 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+@@ -2421,7 +2423,31 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
      AvailFBArea.y1 = 0;
      AvailFBArea.x2 = pScrn->displayWidth;
      AvailFBArea.y2 = offscreenHeight;
@@ -40,7 +40,8 @@
 +    
 +    if ((fbarea = xf86AllocateOffscreenArea(pScreen,
 +					    pScrn->displayWidth,
-+					    NV_ALIGN(pScrn->virtualY, 64),
++					    NV_ALIGN(pScrn->virtualY, 64) -
++					    pScrn->virtualY + 2,
 +					    0, NULL, NULL, NULL))) {
 +	xf86DrvMsg(scrnIndex, X_INFO,
 +		   "Reserved area from (%d,%d) to (%d,%d)\n",


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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- xorg-x11-drv-nv.spec	18 Jan 2008 05:19:28 -0000	1.61
+++ xorg-x11-drv-nv.spec	18 Jan 2008 05:46:19 -0000	1.62
@@ -9,7 +9,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.6
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -101,7 +101,10 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
-* Fri Jan 18 2008 Dave Airlie <ajax at redhat.com> 2.1.6-4
+* Fri Jan 18 2008 Dave Airlie <airlied at redhat.com> 2.1.6-5
+- fixup the fixup for fb vs XAA alignment
+
+* Fri Jan 18 2008 Dave Airlie <airlied 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