rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.26, 1.27 dcbconf_7_4_ignore.diff, 1.1, 1.2 nouveau-fedora.patch, 1.15, 1.16 sources, 1.27, 1.28 xorg-x11-drv-nouveau.spec, 1.32, 1.33
Ben Skeggs
bskeggs at fedoraproject.org
Fri Apr 3 04:16:31 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5990
Modified Files:
.cvsignore dcbconf_7_4_ignore.diff nouveau-fedora.patch
sources xorg-x11-drv-nouveau.spec
Log Message:
* Fri Apr 03 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-21.20090403git11be9a9
- upstream update, loads of modesetting fixes
- rh#492819, rh#492427, rh#492289, rh#492289
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 30 Mar 2009 10:22:48 -0000 1.26
+++ .cvsignore 3 Apr 2009 04:16:00 -0000 1.27
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090330git9d46930.tar.bz2
+xf86-video-nouveau-0.0.12-20090403git11be9a9.tar.bz2
dcbconf_7_4_ignore.diff:
Index: dcbconf_7_4_ignore.diff
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/dcbconf_7_4_ignore.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dcbconf_7_4_ignore.diff 23 Mar 2009 03:50:36 -0000 1.1
+++ dcbconf_7_4_ignore.diff 3 Apr 2009 04:16:00 -0000 1.2
@@ -1,14 +1,13 @@
diff --git a/src/nv_bios.c b/src/nv_bios.c
-index 22421a0..86e9651 100644
+index fe6368e..7b56148 100644
--- a/src/nv_bios.c
+++ b/src/nv_bios.c
-@@ -4507,6 +4507,9 @@ parse_dcb_entry(ScrnInfoPtr pScrn, struct bios_parsed_dcb *bdcb, int index, uint
- mask = ~0x5;
- if (conf & 0x4)
- entry->lvdsconf.use_power_scripts = true;
-+
-+ if ((conf & 0xf0) == 0x60)
-+ mask &= ~0xf0;
- }
- if (conf & mask) {
- /* I'm bored of getting this reported; left as a reminder for someone to fix it */
+@@ -4104,6 +4104,8 @@ parse_dcb20_entry(ScrnInfoPtr pScrn, struct bios_parsed_dcb *bdcb,
+ mask = ~0x5;
+ if (conf & 0x4)
+ entry->lvdsconf.use_power_scripts = true;
++ if ((conf & 0xf0) == 0x60)
++ mask &= ~0xf0;
+ }
+ if (conf & mask) {
+ /* I'm bored of getting this reported; left as a reminder for someone to fix it */
nouveau-fedora.patch:
Index: nouveau-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nouveau-fedora.patch 30 Mar 2009 01:39:07 -0000 1.15
+++ nouveau-fedora.patch 3 Apr 2009 04:16:00 -0000 1.16
@@ -11,7 +11,7 @@
nouveau_output.h \
nouveau_connector.h \
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 7ac7b67..b95ff84 100644
+index 8150a28..bc15231 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -185,6 +185,50 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
@@ -484,7 +484,7 @@
+ return true;
+}
diff --git a/src/nv_bios.c b/src/nv_bios.c
-index fef0e02..8b7b3fe 100644
+index 7da48d2..fe6368e 100644
--- a/src/nv_bios.c
+++ b/src/nv_bios.c
@@ -22,6 +22,9 @@
@@ -497,7 +497,7 @@
#include "nv_include.h"
#if defined(__FreeBSD__) || defined(__NetBSD__)
-@@ -4418,7 +4421,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
+@@ -4485,7 +4488,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
bool NVInitVBIOS(ScrnInfoPtr pScrn)
{
@@ -508,7 +508,7 @@
memset(bios, 0, sizeof(struct nvbios));
-@@ -4429,6 +4435,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+@@ -4496,6 +4502,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
if (bios->length > NV_PROM_SIZE)
bios->length = NV_PROM_SIZE;
@@ -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 4a1a4b1..06f4a79 100644
+index 92232dd..d6391f3 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -21,6 +21,7 @@
@@ -604,7 +604,7 @@
if (!pNv->kms_enable) {
if (pNv->Architecture < NV_ARCH_50)
NVRestore(pScrn);
-@@ -1586,6 +1607,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
+@@ -1589,6 +1610,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,
-@@ -1626,11 +1649,81 @@ NVMapMemSW(ScrnInfoPtr pScrn)
+@@ -1629,11 +1652,81 @@ NVMapMemSW(ScrnInfoPtr pScrn)
}
static Bool
@@ -695,7 +695,7 @@
if (!pNv->dev)
return NVMapMemSW(pScrn);
-@@ -1647,45 +1740,42 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1650,45 +1743,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
-@@ -1759,6 +1849,7 @@ NVUnmapMem(ScrnInfoPtr pScrn)
+@@ -1762,6 +1852,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);
-@@ -2274,6 +2365,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
+@@ -2277,6 +2368,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
bool on = xf86IsUnblank(mode);
int i;
@@ -804,7 +804,7 @@
#ifndef exaMoveInPixmap
extern void exaMoveInPixmap(PixmapPtr pPixmap);
diff --git a/src/nv_type.h b/src/nv_type.h
-index 3eae469..f43dc4c 100644
+index 2ec4fba..5396cc8 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
@@ -270,6 +270,7 @@ typedef struct _NVRec {
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources 30 Mar 2009 10:22:48 -0000 1.27
+++ sources 3 Apr 2009 04:16:00 -0000 1.28
@@ -1 +1 @@
-74eeca3817c37dfa939deea30c29e1ec xf86-video-nouveau-0.0.12-20090330git9d46930.tar.bz2
+55e911e7dadc7e445469a0be81b6306b xf86-video-nouveau-0.0.12-20090403git11be9a9.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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-drv-nouveau.spec 30 Mar 2009 10:22:48 -0000 1.32
+++ xorg-x11-drv-nouveau.spec 3 Apr 2009 04:16:00 -0000 1.33
@@ -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 20090330
-%define git_version 9d46930
+%define gitdate 20090403
+%define git_version 11be9a9
%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: 20.%{snapshot}%{?dist}
+Release: 21.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -77,6 +77,10 @@
%{_mandir}/man4/nouveau.4*
%changelog
+* Fri Apr 03 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-21.20090403git11be9a9
+- upstream update, loads of modesetting fixes
+- rh#492819, rh#492427, rh#492289, rh#492289
+
* Mon Mar 30 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-20.20090330git9d46930
- xv bugfix
More information about the scm-commits
mailing list