rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.24, 1.25 nouveau-eedid.patch, 1.2, 1.3 nouveau-fedora.patch, 1.14, 1.15 sources, 1.25, 1.26 xorg-x11-drv-nouveau.spec, 1.30, 1.31
Ben Skeggs
bskeggs at fedoraproject.org
Mon Mar 30 01:39:38 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10384
Modified Files:
.cvsignore nouveau-eedid.patch nouveau-fedora.patch sources
xorg-x11-drv-nouveau.spec
Log Message:
* Mon Mar 30 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-19.20090330git9213c39
- fix rh#492239, and various modesetting changes
- nouveau-eedid.patch: remove nv50 hunk, is upstream now
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 27 Mar 2009 08:04:18 -0000 1.24
+++ .cvsignore 30 Mar 2009 01:39:07 -0000 1.25
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090327gitf1907dc.tar.bz2
+xf86-video-nouveau-0.0.12-20090330git9213c39.tar.bz2
nouveau-eedid.patch:
Index: nouveau-eedid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-eedid.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-eedid.patch 27 Feb 2009 20:57:08 -0000 1.2
+++ nouveau-eedid.patch 30 Mar 2009 01:39:07 -0000 1.3
@@ -1,18 +1,3 @@
-diff -up xf86-video-nouveau-0.0.12/src/nv50_connector.c.jx xf86-video-nouveau-0.0.12/src/nv50_connector.c
---- xf86-video-nouveau-0.0.12/src/nv50_connector.c.jx 2009-02-23 18:50:48.000000000 -0500
-+++ xf86-video-nouveau-0.0.12/src/nv50_connector.c 2009-02-27 15:17:44.000000000 -0500
-@@ -30,7 +30,11 @@ NV50ConnectorGetEDID(nouveauConnectorPtr
- {
- ScrnInfoPtr pScrn = connector->scrn;
-
-+#ifdef EDID_COMPLETE_RAWDATA
-+ return xf86DoEEDID(pScrn->scrnIndex, connector->pDDCBus, TRUE);
-+#else
- return xf86DoEDID_DDC2(pScrn->scrnIndex, connector->pDDCBus);
-+#endif
- }
-
- static xf86MonPtr
diff -up xf86-video-nouveau-0.0.12/src/nv_setup.c.jx xf86-video-nouveau-0.0.12/src/nv_setup.c
--- xf86-video-nouveau-0.0.12/src/nv_setup.c.jx 2009-02-23 18:50:48.000000000 -0500
+++ xf86-video-nouveau-0.0.12/src/nv_setup.c 2009-02-27 15:17:06.000000000 -0500
nouveau-fedora.patch:
Index: nouveau-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nouveau-fedora.patch 27 Mar 2009 08:04:18 -0000 1.14
+++ nouveau-fedora.patch 30 Mar 2009 01:39:07 -0000 1.15
@@ -1,8 +1,8 @@
diff --git a/src/Makefile.am b/src/Makefile.am
-index f0b51d2..70813d8 100644
+index 29253a6..0c9e4e9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -79,6 +79,7 @@ nouveau_drv_la_SOURCES = \
+@@ -81,6 +81,7 @@ nouveau_drv_la_SOURCES = \
nv50_xv.c \
nv50_texture.h \
nv50reg.h \
@@ -11,7 +11,7 @@
nouveau_output.h \
nouveau_connector.h \
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 8714cad..3bd78ad 100644
+index 7ac7b67..b95ff84 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)
@@ -190,7 +190,7 @@
exa->WaitMarker = nouveau_exa_wait_marker;
diff --git a/src/nv50_randr.c b/src/nv50_randr.c
-index 6399c98..16b43ff 100644
+index 657e13a..6c19780 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 2aded0c..ef1cf78 100644
+index fef0e02..8b7b3fe 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__)
-@@ -4876,7 +4879,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
+@@ -4418,7 +4421,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
bool NVInitVBIOS(ScrnInfoPtr pScrn)
{
@@ -508,7 +508,7 @@
memset(bios, 0, sizeof(struct nvbios));
-@@ -4887,6 +4893,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+@@ -4429,6 +4435,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 4f07836..2f6e4a6 100644
+index 4a1a4b1..06f4a79 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -21,6 +21,7 @@
@@ -789,10 +789,10 @@
return vgaHWSaveScreen(pScreen, mode);
diff --git a/src/nv_proto.h b/src/nv_proto.h
-index 1d00e1a..f4fe6a6 100644
+index 43fa62e..f06c757 100644
--- a/src/nv_proto.h
+++ b/src/nv_proto.h
-@@ -285,6 +285,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool);
+@@ -267,6 +267,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);
@@ -804,10 +804,10 @@
#ifndef exaMoveInPixmap
extern void exaMoveInPixmap(PixmapPtr pPixmap);
diff --git a/src/nv_type.h b/src/nv_type.h
-index f03c198..bc82135 100644
+index 3eae469..f43dc4c 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
-@@ -273,6 +273,7 @@ typedef struct _NVRec {
+@@ -270,6 +270,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;
-@@ -281,6 +282,9 @@ typedef struct _NVRec {
+@@ -278,6 +279,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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 27 Mar 2009 08:04:18 -0000 1.25
+++ sources 30 Mar 2009 01:39:07 -0000 1.26
@@ -1 +1 @@
-3bb13a61a4fd06e9989bfdfa59340f95 xf86-video-nouveau-0.0.12-20090327gitf1907dc.tar.bz2
+436721b5a5f19f2cadcd9ed2cbee4958 xf86-video-nouveau-0.0.12-20090330git9213c39.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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xorg-x11-drv-nouveau.spec 27 Mar 2009 08:04:18 -0000 1.30
+++ xorg-x11-drv-nouveau.spec 30 Mar 2009 01:39:07 -0000 1.31
@@ -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 20090327
-%define git_version f1907dc
+%define gitdate 20090330
+%define git_version 9213c39
%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: 18.%{snapshot}%{?dist}
+Release: 19.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -77,6 +77,10 @@
%{_mandir}/man4/nouveau.4*
%changelog
+* Mon Mar 30 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-19.20090330git9213c39
+- fix rh#492239, and various modesetting changes
+- nouveau-eedid.patch: remove nv50 hunk, is upstream now
+
* Fri Mar 27 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-18.20090327gitf1907dc
- nv50: add default modes to mode pool for lvds panels (rh#492360)
- kms: fix getting edid blob from kernel
More information about the fedora-extras-commits
mailing list