rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.12, 1.13 nouveau-fedora.patch, 1.2, 1.3 sources, 1.13, 1.14 xorg-x11-drv-nouveau.spec, 1.18, 1.19
Ben Skeggs
bskeggs at fedoraproject.org
Mon Mar 2 06:06:07 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29830
Modified Files:
.cvsignore nouveau-fedora.patch sources
xorg-x11-drv-nouveau.spec
Log Message:
* Mon Mar 02 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-7.20090302gite6c3b98
- upstream update, fixes
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 24 Feb 2009 00:32:57 -0000 1.12
+++ .cvsignore 2 Mar 2009 06:05:37 -0000 1.13
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090224gitd91fc78.tar.bz2
+xf86-video-nouveau-0.0.12-20090302gite6c3b98.tar.bz2
nouveau-fedora.patch:
Index: nouveau-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-fedora.patch 24 Feb 2009 00:05:28 -0000 1.2
+++ nouveau-fedora.patch 2 Mar 2009 06:05:37 -0000 1.3
@@ -24,7 +24,7 @@
ErrorF("failed to add fb\n");
return FALSE;
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
-index b656ca7..f236c57 100644
+index 93fc3c5..6854b68 100644
--- a/src/nouveau_exa.c
+++ b/src/nouveau_exa.c
@@ -265,7 +265,8 @@ nouveau_exa_wait_marker(ScreenPtr pScreen, int marker)
@@ -85,7 +85,7 @@
return false;
return true;
-@@ -604,6 +617,12 @@ nouveau_exa_init(ScreenPtr pScreen)
+@@ -608,6 +621,12 @@ nouveau_exa_init(ScreenPtr pScreen)
exa->maxY = 2048;
}
@@ -407,7 +407,7 @@
/* 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 97a5aa8..d977c06 100644
+index 97a5aa8..1e6f0e1 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1583,6 +1583,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
@@ -488,7 +488,7 @@
}
if (!pNv->NoAccel) {
-@@ -2295,6 +2320,14 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
+@@ -2295,6 +2320,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
bool on = xf86IsUnblank(mode);
int i;
@@ -496,18 +496,19 @@
+ * This happens to one of the few, if not the only place.
+ * When we move to driver allocated pixmaps, we can move this.
+ */
-+ if (mode == SCREEN_SAVER_FORCER && pNv->Architecture == NV_ARCH_50 &&
-+ !pNv->screen_damage && !nv50_shadow_damage_create(pScrn))
++ if (mode == SCREEN_SAVER_FORCER && pNv->Architecture == NV_ARCH_50 &&
++ !pNv->NoAccel && !pNv->screen_damage &&
++ !nv50_shadow_damage_create(pScrn))
+ return FALSE;
+
if (!pNv->randr12_enable)
return vgaHWSaveScreen(pScreen, mode);
diff --git a/src/nv_proto.h b/src/nv_proto.h
-index cc0d2cc..f73770d 100644
+index baa531d..8451283 100644
--- a/src/nv_proto.h
+++ b/src/nv_proto.h
-@@ -276,6 +276,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool);
+@@ -278,6 +278,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool);
int nv50_xv_port_attribute_set(ScrnInfoPtr, Atom, INT32, pointer);
int nv50_xv_port_attribute_get(ScrnInfoPtr, Atom, INT32 *, pointer);
@@ -519,10 +520,10 @@
#ifndef exaMoveInPixmap
extern void exaMoveInPixmap(PixmapPtr pPixmap);
diff --git a/src/nv_type.h b/src/nv_type.h
-index 5daef61..defb42b 100644
+index d363984..79df562 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
-@@ -249,12 +249,15 @@ typedef struct _NVRec {
+@@ -268,12 +268,15 @@ typedef struct _NVRec {
/* Various pinned memory regions */
struct nouveau_bo * FB;
void * FBMap;
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 24 Feb 2009 00:32:57 -0000 1.13
+++ sources 2 Mar 2009 06:05:37 -0000 1.14
@@ -1 +1 @@
-51cf0eff74ac9d851a6aa15b8082b531 xf86-video-nouveau-0.0.12-20090224gitd91fc78.tar.bz2
+4c235d75393cac02d46caa984eeb22bf xf86-video-nouveau-0.0.12-20090302gite6c3b98.tar.bz2
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-drv-nouveau.spec 27 Feb 2009 20:19:07 -0000 1.18
+++ xorg-x11-drv-nouveau.spec 2 Mar 2009 06:05:37 -0000 1.19
@@ -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 20090224
-%define git_version d91fc78
+%define gitdate 20090302
+%define git_version e6c3b98
%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: 6.%{snapshot}%{?dist}
+Release: 7.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -75,11 +75,14 @@
%{_mandir}/man4/nouveau.4*
%changelog
+* Mon Mar 02 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-7.20090302gite6c3b98
+- upstream update, fixes
+
* Fri Feb 27 2009 Adam Jackson <ajax at redhat.com> 0.0.12-6.20090224gitd91fc78
- nouveau-eedid.patch: Do EEDID.
* Tue Feb 24 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-5.20090224gitd91fc78
-- improve edescription of package
+- improve description of package
* Tue Feb 24 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-4.20090224gitd91fc78
- new upstream snapshot
More information about the fedora-extras-commits
mailing list