rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.21, 1.22 nouveau-fedora.patch, 1.11, 1.12 sources, 1.22, 1.23 xorg-x11-drv-nouveau.spec, 1.27, 1.28
Ben Skeggs
bskeggs at fedoraproject.org
Thu Mar 26 02:01:18 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15222
Modified Files:
.cvsignore nouveau-fedora.patch sources
xorg-x11-drv-nouveau.spec
Log Message:
* Thu Mar 26 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-16.20090326git01cee29
- update, should fix rh#497173
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 23 Mar 2009 04:54:43 -0000 1.21
+++ .cvsignore 26 Mar 2009 02:00:46 -0000 1.22
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090323git4067ab4.tar.bz2
+xf86-video-nouveau-0.0.12-20090326git01cee29.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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nouveau-fedora.patch 23 Mar 2009 04:54:44 -0000 1.11
+++ nouveau-fedora.patch 26 Mar 2009 02:00:46 -0000 1.12
@@ -11,10 +11,10 @@
nouveau_output.h \
nouveau_connector.h \
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 850c9be..736757f 100644
+index 7341392..eb2f445 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
-@@ -187,6 +187,50 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
+@@ -185,6 +185,50 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
}
static void
@@ -65,7 +65,7 @@
drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
int x, int y)
{
-@@ -196,6 +240,11 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -194,6 +238,11 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
PixmapPtr pspix, pdpix;
int w, h;
@@ -77,7 +77,7 @@
pspix = drmmode_fb_pixmap(pScrn, src_id, NULL, NULL);
if (!pspix)
return;
-@@ -241,7 +290,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -239,7 +288,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
ret = drmModeAddFB(drmmode->fd,
pScrn->virtualX, pScrn->virtualY,
pScrn->depth, pScrn->bitsPerPixel,
@@ -86,7 +86,7 @@
if (ret < 0) {
ErrorF("failed to add fb\n");
return FALSE;
-@@ -294,8 +343,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -292,8 +341,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
if (drmmode_crtc->rotate_fb_id)
fb_id = drmmode_crtc->rotate_fb_id;
else
@@ -523,10 +523,10 @@
}
diff --git a/src/nv_dri.c b/src/nv_dri.c
-index 37538f0..ec47e0b 100644
+index bd3e5a9..dca6a40 100644
--- a/src/nv_dri.c
+++ b/src/nv_dri.c
-@@ -332,7 +332,7 @@ Bool NVDRIFinishScreenInit(ScrnInfoPtr pScrn)
+@@ -337,7 +337,7 @@ Bool NVDRIFinishScreenInit(ScrnInfoPtr pScrn)
pNOUVEAUDRI->depth = pScrn->depth;
pNOUVEAUDRI->bpp = pScrn->bitsPerPixel;
@@ -536,7 +536,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"[dri] unable to reference front buffer: %d\n", ret);
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index ec4577f..f3c539d 100644
+index 220a88e..50c67b9 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -21,6 +21,7 @@
@@ -547,7 +547,7 @@
#include "nv_include.h"
-@@ -650,14 +651,27 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
+@@ -654,14 +655,27 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
*/
/* Mandatory */
@@ -575,7 +575,7 @@
if (!pNv->NoAccel)
NVAccelCommonInit(pScrn);
-@@ -668,10 +682,11 @@ NVEnterVT(int scrnIndex, int flags)
+@@ -672,10 +686,11 @@ NVEnterVT(int scrnIndex, int flags)
/* Clear the framebuffer, we don't want to see garbage
* on-screen up until X decides to draw something
*/
@@ -591,7 +591,7 @@
if (pNv->Architecture == NV_ARCH_50) {
if (!NV50AcquireDisplay(pScrn))
-@@ -714,6 +729,12 @@ NVLeaveVT(int scrnIndex, int flags)
+@@ -718,6 +733,12 @@ NVLeaveVT(int scrnIndex, int flags)
NVSync(pScrn);
@@ -602,9 +602,9 @@
+ }
+
if (!pNv->kms_enable) {
- if (pNv->Architecture == NV_ARCH_50) {
- NV50ReleaseDisplay(pScrn);
-@@ -1581,6 +1602,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
+ if (pNv->Architecture < NV_ARCH_50)
+ NVRestore(pScrn);
+@@ -1582,6 +1603,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
return FALSE;
pNv->GART = NULL;
@@ -613,7 +613,7 @@
ret = nouveau_bo_fake(&dev, Cursor0Offset,
NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
64 * 64 * 4, pNv->VRAMMap + Cursor0Offset,
-@@ -1621,11 +1644,81 @@ NVMapMemSW(ScrnInfoPtr pScrn)
+@@ -1622,11 +1645,81 @@ NVMapMemSW(ScrnInfoPtr pScrn)
}
static Bool
@@ -695,7 +695,7 @@
if (!pNv->dev)
return NVMapMemSW(pScrn);
-@@ -1642,45 +1735,42 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1643,45 +1736,42 @@ NVMapMem(ScrnInfoPtr pScrn)
size = size * (pScrn->bitsPerPixel >> 3);
size = size * pScrn->virtualY;
} else {
@@ -764,7 +764,7 @@
}
/* We don't need to allocate cursors / lut here if we're using
-@@ -1754,6 +1844,7 @@ NVUnmapMem(ScrnInfoPtr pScrn)
+@@ -1755,6 +1845,7 @@ NVUnmapMem(ScrnInfoPtr pScrn)
}
nouveau_bo_ref(NULL, &pNv->FB);
@@ -772,7 +772,7 @@
nouveau_bo_ref(NULL, &pNv->GART);
nouveau_bo_ref(NULL, &pNv->Cursor);
nouveau_bo_ref(NULL, &pNv->Cursor2);
-@@ -2265,6 +2356,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
+@@ -2270,6 +2361,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
bool on = xf86IsUnblank(mode);
int i;
@@ -789,10 +789,10 @@
return vgaHWSaveScreen(pScreen, mode);
diff --git a/src/nv_proto.h b/src/nv_proto.h
-index af888d0..dd78719 100644
+index 1d00e1a..f4fe6a6 100644
--- a/src/nv_proto.h
+++ b/src/nv_proto.h
-@@ -284,6 +284,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool);
+@@ -285,6 +285,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);
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 23 Mar 2009 04:54:44 -0000 1.22
+++ sources 26 Mar 2009 02:00:46 -0000 1.23
@@ -1 +1 @@
-3c65f05b0b0381a344d5f341307a9a41 xf86-video-nouveau-0.0.12-20090323git4067ab4.tar.bz2
+f5a3ba21259ea5d436cdfc0acce0c6ee xf86-video-nouveau-0.0.12-20090326git01cee29.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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-drv-nouveau.spec 23 Mar 2009 04:54:44 -0000 1.27
+++ xorg-x11-drv-nouveau.spec 26 Mar 2009 02:00:47 -0000 1.28
@@ -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 20090323
-%define git_version 4067ab4
+%define gitdate 20090326
+%define git_version 01cee29
%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: 15.%{snapshot}%{?dist}
+Release: 16.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -77,6 +77,9 @@
%{_mandir}/man4/nouveau.4*
%changelog
+* Thu Mar 26 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-16.20090326git01cee29
+- update, should fix rh#497173
+
* Mon Mar 23 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-15.20090324git4067ab4
- more ppc build fixes
More information about the fedora-extras-commits
mailing list