rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.10, 1.11 nouveau-fedora.patch, 1.1, 1.2 sources, 1.11, 1.12 xorg-x11-drv-nouveau.spec, 1.15, 1.16
Ben Skeggs
bskeggs at fedoraproject.org
Tue Feb 24 00:05:59 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23085
Modified Files:
.cvsignore nouveau-fedora.patch sources
xorg-x11-drv-nouveau.spec
Log Message:
* Tue Feb 24 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-4.20090224gitd91fc78
- new upstream snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 17 Feb 2009 02:33:22 -0000 1.10
+++ .cvsignore 24 Feb 2009 00:05:28 -0000 1.11
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090216git7b25a30.tar.bz2
+xorg-x11-drv-nouveau-0.0.12-4.20090224gitd91fc78.fc11.src.rpm
nouveau-fedora.patch:
Index: nouveau-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nouveau-fedora.patch 16 Feb 2009 06:44:53 -0000 1.1
+++ nouveau-fedora.patch 24 Feb 2009 00:05:28 -0000 1.2
@@ -10,8 +10,21 @@
nouveau_crtc.h \
nouveau_output.h \
nouveau_connector.h \
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index ddb6aef..2dbc5a3 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
+@@ -151,7 +151,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+ ret = drmModeAddFB(drmmode->fd,
+ pScrn->virtualX, pScrn->virtualY,
+ pScrn->depth, pScrn->bitsPerPixel,
+- pitch, pNv->FB->handle, &drmmode->fb_id);
++ pitch, pNv->scanout->handle, &drmmode->fb_id);
+ if (ret < 0) {
+ ErrorF("failed to add fb\n");
+ return FALSE;
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
-index b7c3a87..3db6be7 100644
+index b656ca7..f236c57 100644
--- a/src/nouveau_exa.c
+++ b/src/nouveau_exa.c
@@ -265,7 +265,8 @@ nouveau_exa_wait_marker(ScreenPtr pScreen, int marker)
@@ -72,7 +85,7 @@
return false;
return true;
-@@ -602,6 +615,12 @@ nouveau_exa_init(ScreenPtr pScreen)
+@@ -604,6 +617,12 @@ nouveau_exa_init(ScreenPtr pScreen)
exa->maxY = 2048;
}
@@ -380,8 +393,21 @@
+
+ return true;
+}
+diff --git a/src/nv_dri.c b/src/nv_dri.c
+index 796df9b..ac7022b 100644
+--- a/src/nv_dri.c
++++ b/src/nv_dri.c
+@@ -405,7 +405,7 @@ Bool NVDRIFinishScreenInit(ScrnInfoPtr pScrn)
+ pNOUVEAUDRI->depth = pScrn->depth;
+ pNOUVEAUDRI->bpp = pScrn->bitsPerPixel;
+
+- pNOUVEAUDRI->front_offset = pNv->FB->offset;
++ pNOUVEAUDRI->front_offset = pNv->scanout->offset;
+ pNOUVEAUDRI->front_pitch = pScrn->displayWidth;
+ /* back/depth buffers will likely be allocated on a per-drawable
+ * basis, but these may be useful if we want to support shared back
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 96384c4..a961e3a 100644
+index 97a5aa8..d977c06 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1583,6 +1583,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
@@ -448,7 +474,21 @@
nouveau_bo_ref(NULL, &pNv->GART);
nouveau_bo_ref(NULL, &pNv->Cursor);
nouveau_bo_ref(NULL, &pNv->Cursor2);
-@@ -2285,6 +2310,14 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
+@@ -2058,10 +2083,10 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ * up until X decides to draw something
+ */
+ if (!pNv->kms_enable) {
+- nouveau_bo_map(pNv->FB, NOUVEAU_BO_WR);
+- memset(pNv->FB->map, 0, NOUVEAU_ALIGN(pScrn->virtualX, 64) *
++ nouveau_bo_map(pNv->scanout, NOUVEAU_BO_WR);
++ memset(pNv->scanout->map, 0, NOUVEAU_ALIGN(pScrn->virtualX, 64) *
+ pScrn->virtualY * (pScrn->bitsPerPixel >> 3));
+- nouveau_bo_unmap(pNv->FB);
++ nouveau_bo_unmap(pNv->scanout);
+ }
+
+ if (!pNv->NoAccel) {
+@@ -2295,6 +2320,14 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
bool on = xf86IsUnblank(mode);
int i;
@@ -479,7 +519,7 @@
#ifndef exaMoveInPixmap
extern void exaMoveInPixmap(PixmapPtr pPixmap);
diff --git a/src/nv_type.h b/src/nv_type.h
-index 88acd14..1000f67 100644
+index 5daef61..defb42b 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
@@ -249,12 +249,15 @@ typedef struct _NVRec {
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 17 Feb 2009 02:33:22 -0000 1.11
+++ sources 24 Feb 2009 00:05:28 -0000 1.12
@@ -1 +1 @@
-650180d94cebbaf6f3241a7c3f595fdc xf86-video-nouveau-0.0.12-20090216git7b25a30.tar.bz2
+e518fba85da590cd392a652cad38d6a6 xorg-x11-drv-nouveau-0.0.12-4.20090224gitd91fc78.fc11.src.rpm
Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-nouveau.spec 17 Feb 2009 02:36:14 -0000 1.15
+++ xorg-x11-drv-nouveau.spec 24 Feb 2009 00:05:28 -0000 1.16
@@ -7,8 +7,8 @@
# git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
# git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
-%define gitdate 20090216
-%define git_version 7b25a30
+%define gitdate 20090224
+%define git_version d91fc78
%define snapshot %{gitdate}git%{git_version}
@@ -19,7 +19,7 @@
# need to set an epoch to get version number in sync with upstream
Epoch: 1
Version: %{nouveau_version}
-Release: 1.%{snapshot}%{?dist}
+Release: 4.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -73,6 +73,9 @@
%{_mandir}/man4/nouveau.4*
%changelog
+* Tue Feb 24 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-4.20090224gitd91fc78
+- new upstream snapshot
+
* Tue Feb 17 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-1.20090216git7b25a30
- fixes from upstream
- append git version to tarball filename
More information about the fedora-extras-commits
mailing list