rpms/xorg-x11-drv-nouveau/devel dcbconf_7_4_ignore.diff, NONE, 1.1 .cvsignore, 1.18, 1.19 nouveau-fedora.patch, 1.8, 1.9 sources, 1.19, 1.20 xorg-x11-drv-nouveau.spec, 1.24, 1.25
Ben Skeggs
bskeggs at fedoraproject.org
Mon Mar 23 03:51:09 UTC 2009
- Previous message: rpms/kernel/F-10 patch-2.6.29-rc8-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.1000, 1.1001 kernel.spec, 1.1298, 1.1299 linux-2.6-utrace-ftrace.patch, 1.1, 1.2 linux-2.6-utrace.patch, 1.107, 1.108 sources, 1.961, 1.962 upstream, 1.872, 1.873 patch-2.6.29-rc8-git5.bz2.sign, 1.1, NONE
- Next message: rpms/fwbackups/F-10 .cvsignore, 1.10, 1.11 fwbackups.spec, 1.23, 1.24 sources, 1.10, 1.11 fwbackups-1.43.2-trayNotify.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14300
Modified Files:
.cvsignore nouveau-fedora.patch sources
xorg-x11-drv-nouveau.spec
Added Files:
dcbconf_7_4_ignore.diff
Log Message:
* Mon Mar 23 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-13.20090323gitd80fe78
- modesetting fixes, should handle rh#487456
dcbconf_7_4_ignore.diff:
--- NEW FILE dcbconf_7_4_ignore.diff ---
diff --git a/src/nv_bios.c b/src/nv_bios.c
index 22421a0..86e9651 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 */
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 23 Mar 2009 03:00:01 -0000 1.18
+++ .cvsignore 23 Mar 2009 03:50:36 -0000 1.19
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090318git3e7fa97.tar.bz2
+xf86-video-nouveau-0.0.12-20090323gitd80fe78.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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nouveau-fedora.patch 23 Mar 2009 03:00:01 -0000 1.8
+++ nouveau-fedora.patch 23 Mar 2009 03:50:36 -0000 1.9
@@ -190,7 +190,7 @@
exa->WaitMarker = nouveau_exa_wait_marker;
diff --git a/src/nv50_randr.c b/src/nv50_randr.c
-index 6fbba6b..5ce1e64 100644
+index aad84f4..f37386e 100644
--- a/src/nv50_randr.c
+++ b/src/nv50_randr.c
@@ -99,7 +99,7 @@ nv50_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, DisplayModePtr adjuste
@@ -484,7 +484,7 @@
+ return true;
+}
diff --git a/src/nv_bios.c b/src/nv_bios.c
-index 02a6624..22421a0 100644
+index 6934cf1..24c6750 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__)
-@@ -4871,7 +4874,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
+@@ -4876,7 +4879,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
bool NVInitVBIOS(ScrnInfoPtr pScrn)
{
@@ -508,7 +508,7 @@
memset(bios, 0, sizeof(struct nvbios));
-@@ -4882,6 +4888,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+@@ -4887,6 +4893,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 f54fa72..de90d19 100644
+index 0776083..81b879d 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -21,6 +21,7 @@
@@ -804,10 +804,10 @@
#ifndef exaMoveInPixmap
extern void exaMoveInPixmap(PixmapPtr pPixmap);
diff --git a/src/nv_type.h b/src/nv_type.h
-index 4a7c04f..8a0e7a1 100644
+index f03c198..bc82135 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
-@@ -268,6 +268,7 @@ typedef struct _NVRec {
+@@ -273,6 +273,7 @@ typedef struct _NVRec {
/* Various pinned memory regions */
struct nouveau_bo * FB;
void * FBMap;
@@ -815,7 +815,7 @@
//struct nouveau_bo * FB_old; /* for KMS */
struct nouveau_bo * shadow[2]; /* for easy acces by exa */
struct nouveau_bo * Cursor;
-@@ -276,6 +277,9 @@ typedef struct _NVRec {
+@@ -281,6 +282,9 @@ typedef struct _NVRec {
struct nvbios VBIOS;
struct nouveau_bios_info *vbios;
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 23 Mar 2009 03:00:01 -0000 1.19
+++ sources 23 Mar 2009 03:50:36 -0000 1.20
@@ -1 +1 @@
-0ead6335c852ae47cf7b14fea0c3d87b xf86-video-nouveau-0.0.12-20090318git3e7fa97.tar.bz2
+4dbabcb2e49a181abf0249bc8d8620cc xf86-video-nouveau-0.0.12-20090323gitd80fe78.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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-drv-nouveau.spec 23 Mar 2009 03:00:01 -0000 1.24
+++ xorg-x11-drv-nouveau.spec 23 Mar 2009 03:50:36 -0000 1.25
@@ -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 20090318
-%define git_version 3e7fa97
+%define gitdate 20090323
+%define git_version d80fe78
%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: 12.%{snapshot}%{?dist}
+Release: 13.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -77,6 +77,9 @@
%{_mandir}/man4/nouveau.4*
%changelog
+* Mon Mar 23 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-13.20090323gitd80fe78
+- modesetting fixes, should handle rh#487456
+
* Mon Mar 23 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-12.20090318git3e7fa97
- upstream update, various fixes to pre-nv50 modesetting, cleanups
- Previous message: rpms/kernel/F-10 patch-2.6.29-rc8-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.1000, 1.1001 kernel.spec, 1.1298, 1.1299 linux-2.6-utrace-ftrace.patch, 1.1, 1.2 linux-2.6-utrace.patch, 1.107, 1.108 sources, 1.961, 1.962 upstream, 1.872, 1.873 patch-2.6.29-rc8-git5.bz2.sign, 1.1, NONE
- Next message: rpms/fwbackups/F-10 .cvsignore, 1.10, 1.11 fwbackups.spec, 1.23, 1.24 sources, 1.10, 1.11 fwbackups-1.43.2-trayNotify.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list