rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.14, 1.15 nouveau-fedora.patch, 1.4, 1.5 sources, 1.15, 1.16 xorg-x11-drv-nouveau.spec, 1.20, 1.21
Ben Skeggs
bskeggs at fedoraproject.org
Mon Mar 9 04:41:03 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4271
Modified Files:
.cvsignore nouveau-fedora.patch sources
xorg-x11-drv-nouveau.spec
Log Message:
* Mon Mar 09 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-9.20090309gited9bd88
- upstream update, fixes
- store used vbios image in /var/run, will potentially help debugging later
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 5 Mar 2009 06:07:55 -0000 1.14
+++ .cvsignore 9 Mar 2009 04:40:32 -0000 1.15
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090305git42f99e6.tar.bz2
+xf86-video-nouveau-0.0.12-20090309gited9bd88.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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nouveau-fedora.patch 5 Mar 2009 06:07:55 -0000 1.4
+++ nouveau-fedora.patch 9 Mar 2009 04:40:33 -0000 1.5
@@ -11,7 +11,7 @@
nouveau_output.h \
nouveau_connector.h \
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index ddb6aef..ca229db 100644
+index 081d194..ca229db 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -127,6 +127,50 @@ drmmode_crtc_dpms(xf86CrtcPtr drmmode_crtc, int mode)
@@ -87,49 +87,6 @@
ret = drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
fb_id, x, y, output_ids, output_count, &kmode);
if (ret)
-@@ -370,8 +420,6 @@ drmmode_gamma_set(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
- drmmode_ptr drmmode = drmmode_crtc->drmmode;
- int ret;
-
-- return;
--
- ret = drmModeCrtcSetGamma(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
- size, red, green, blue);
- if (ret != 0) {
-@@ -519,7 +567,32 @@ drmmode_output_destroy(xf86OutputPtr output)
- static void
- drmmode_output_dpms(xf86OutputPtr output, int mode)
- {
-- return;
-+ drmmode_output_private_ptr drmmode_output = output->driver_private;
-+ drmModeConnectorPtr koutput = drmmode_output->mode_output;
-+ drmModePropertyPtr props;
-+ drmmode_ptr drmmode = drmmode_output->drmmode;
-+ int mode_id = -1, i;
-+
-+ if (!NVPTR(output->scrn)->allow_dpms)
-+ return;
-+
-+ for (i = 0; i < koutput->count_props; i++) {
-+ props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
-+ if (props && (props->flags && DRM_MODE_PROP_ENUM)) {
-+ if (!strcmp(props->name, "DPMS")) {
-+ mode_id = koutput->props[i];
-+ drmModeFreeProperty(props);
-+ break;
-+ }
-+ drmModeFreeProperty(props);
-+ }
-+ }
-+
-+ if (mode_id < 0)
-+ return;
-+
-+ drmModeConnectorSetProperty(drmmode->fd, koutput->connector_id,
-+ mode_id, mode);
- }
-
- /*
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
index 93fc3c5..6854b68 100644
--- a/src/nouveau_exa.c
@@ -500,6 +457,45 @@
+
+ return true;
+}
+diff --git a/src/nv_bios.c b/src/nv_bios.c
+index 9f4b665..68bc296 100644
+--- a/src/nv_bios.c
++++ b/src/nv_bios.c
+@@ -22,6 +22,9 @@
+ * SOFTWARE.
+ */
+
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
+ #include "nv_include.h"
+
+ #if defined(__FreeBSD__) || defined(__NetBSD__)
+@@ -4855,7 +4858,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
+
+ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+ {
++ NVPtr pNv = NVPTR(pScrn);
+ struct nvbios *bios = &NVPTR(pScrn)->VBIOS;
++ char img[128];
++ int fd;
+
+ memset(bios, 0, sizeof(struct nvbios));
+
+@@ -4866,6 +4872,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+ if (bios->length > NV_PROM_SIZE)
+ bios->length = NV_PROM_SIZE;
+
++ sprintf(img, "/var/run/nv%02x_%04x.rom", pNv->NVArch, pNv->Chipset);
++ fd = open(img, O_CREAT|O_RDWR|O_EXCL, 0700);
++ if (fd >= 0) {
++ write(fd, bios->data, bios->length);
++ close(fd);
++ }
++
+ return true;
+ }
+
diff --git a/src/nv_dri.c b/src/nv_dri.c
index 796df9b..ac7022b 100644
--- a/src/nv_dri.c
@@ -514,7 +510,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 d7e8025..42df24a 100644
+index b4739fa..42df24a 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1583,6 +1583,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
@@ -596,18 +592,7 @@
}
if (!pNv->randr12_enable) {
-@@ -2099,8 +2125,10 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- if (!NV50AcquireDisplay(pScrn))
- return FALSE;
-
-+ pNv->allow_dpms = FALSE;
- if (!xf86SetDesiredModes(pScrn))
- return FALSE;
-+ pNv->allow_dpms = TRUE;
- }
-
- /* Darken the screen for aesthetic reasons */
-@@ -2295,6 +2323,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
+@@ -2297,6 +2323,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
bool on = xf86IsUnblank(mode);
int i;
@@ -624,10 +609,10 @@
return vgaHWSaveScreen(pScreen, mode);
diff --git a/src/nv_proto.h b/src/nv_proto.h
-index 28605a8..dd2be16 100644
+index 69ef280..e70b256 100644
--- a/src/nv_proto.h
+++ b/src/nv_proto.h
-@@ -280,6 +280,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool);
+@@ -279,6 +279,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);
@@ -639,10 +624,10 @@
#ifndef exaMoveInPixmap
extern void exaMoveInPixmap(PixmapPtr pPixmap);
diff --git a/src/nv_type.h b/src/nv_type.h
-index db5023f..70b806b 100644
+index b8031e3..e67c75a 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
-@@ -269,6 +269,7 @@ typedef struct _NVRec {
+@@ -270,6 +270,7 @@ typedef struct _NVRec {
/* Various pinned memory regions */
struct nouveau_bo * FB;
void * FBMap;
@@ -650,7 +635,7 @@
//struct nouveau_bo * FB_old; /* for KMS */
struct nouveau_bo * shadow[2]; /* for easy acces by exa */
struct nouveau_bo * Cursor;
-@@ -277,6 +278,9 @@ typedef struct _NVRec {
+@@ -278,6 +279,9 @@ typedef struct _NVRec {
struct nvbios VBIOS;
struct nouveau_bios_info *vbios;
@@ -660,11 +645,3 @@
Bool NoAccel;
Bool HWCursor;
Bool FpScale;
-@@ -355,6 +359,7 @@ typedef struct _NVRec {
-
- #ifdef XF86DRM_MODE
- void *drmmode; /* for KMS */
-+ Bool allow_dpms;
- #endif
-
- nouveauCrtcPtr crtc[2];
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 5 Mar 2009 06:07:55 -0000 1.15
+++ sources 9 Mar 2009 04:40:33 -0000 1.16
@@ -1 +1 @@
-062620c6fa226f2515dbd75d38f67c8c xf86-video-nouveau-0.0.12-20090305git42f99e6.tar.bz2
+d593198e6802afaff49fb1619f949d72 xf86-video-nouveau-0.0.12-20090309gited9bd88.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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-drv-nouveau.spec 5 Mar 2009 06:07:55 -0000 1.20
+++ xorg-x11-drv-nouveau.spec 9 Mar 2009 04:40:33 -0000 1.21
@@ -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 20090305
-%define git_version 42f99e6
+%define gitdate 20090309
+%define git_version ed9bd88
%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: 8.%{snapshot}%{?dist}
+Release: 9.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -75,6 +75,10 @@
%{_mandir}/man4/nouveau.4*
%changelog
+* Mon Mar 09 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-9.20090309gited9bd88
+- upstream update, fixes
+- store used vbios image in /var/run, will potentially help debugging later
+
* Thu Mar 05 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-8.20090305git42f99e6
- upstream update, fixes
- kms: support gamma and dpms calls
More information about the fedora-extras-commits
mailing list