rpms/xorg-x11-drv-nouveau/F-11 .cvsignore, 1.34, 1.35 nouveau-fb-resize.patch, 1.3, 1.4 nouveau-multiple-xserver.patch, 1.4, 1.5 nouveau-nv50-fb-accel.patch, 1.4, 1.5 nouveau-nv50-nva0-noaccel.patch, 1.4, 1.5 nouveau-store-vbios.patch, 1.4, 1.5 nouveau-transition-hack.patch, 1.4, 1.5 sources, 1.35, 1.36 xorg-x11-drv-nouveau.spec, 1.43, 1.44

Ben Skeggs bskeggs at fedoraproject.org
Fri May 1 05:58:50 UTC 2009


Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32568

Modified Files:
	.cvsignore nouveau-fb-resize.patch 
	nouveau-multiple-xserver.patch nouveau-nv50-fb-accel.patch 
	nouveau-nv50-nva0-noaccel.patch nouveau-store-vbios.patch 
	nouveau-transition-hack.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Fri May 01 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-32.20090501gitf69b34a
- upstream update fixing serious issues in nv50 output setup




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	20 Apr 2009 23:06:47 -0000	1.34
+++ .cvsignore	1 May 2009 05:58:19 -0000	1.35
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090421git47bb00f.tar.bz2
+xf86-video-nouveau-0.0.12-20090501gitf69b34a.tar.bz2

nouveau-fb-resize.patch:

Index: nouveau-fb-resize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-fb-resize.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nouveau-fb-resize.patch	21 Apr 2009 05:10:01 -0000	1.3
+++ nouveau-fb-resize.patch	1 May 2009 05:58:20 -0000	1.4
@@ -1,4 +1,4 @@
-From 7e4b7775589cff4433de1f3dfa1416c66cdfe060 Mon Sep 17 00:00:00 2001
+From 61ac455bfcfaf4caa9cac9067f4693c2d56715c7 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at caspar.localdomain>
 Date: Tue, 14 Apr 2009 09:23:07 +1000
 Subject: [PATCH 6/6] f11: support framebuffer resize without driver pixmaps
@@ -173,7 +173,7 @@ index aee2794..41e3f85 100644
  	exa->MarkSync = nouveau_exa_mark_sync;
  	exa->WaitMarker = nouveau_exa_wait_marker;
 diff --git a/src/nv50_randr.c b/src/nv50_randr.c
-index 538c883..c451ba3 100644
+index 61b9e79..b1fca9b 100644
 --- a/src/nv50_randr.c
 +++ b/src/nv50_randr.c
 @@ -289,8 +289,14 @@ nv50_crtc_set_origin(xf86CrtcPtr crtc, int x, int y)
@@ -192,10 +192,10 @@ index 538c883..c451ba3 100644
  	NV50DisplayCommand(pScrn, NV50_UPDATE_DISPLAY, 0);
  }
 diff --git a/src/nv_crtc.c b/src/nv_crtc.c
-index 1d50874..cfa06e1 100644
+index 6de8733..dfc7f8e 100644
 --- a/src/nv_crtc.c
 +++ b/src/nv_crtc.c
-@@ -1154,7 +1154,10 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
+@@ -1159,7 +1159,10 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
  	ScrnInfoPtr pScrn = crtc->scrn;
  	NVPtr pNv = NVPTR(pScrn);    
  	struct nouveau_crtc *nv_crtc = to_nouveau_crtc(crtc);
@@ -207,7 +207,7 @@ index 1d50874..cfa06e1 100644
  
  	if (crtc->rotatedData != NULL) /* we do not exist on the real framebuffer */
  #if NOUVEAU_EXA_PIXMAPS
-@@ -1162,8 +1165,17 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
+@@ -1167,8 +1170,17 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
  #else
  		start = pNv->FB->offset + nv_crtc->shadow->offset; /* We do exist relative to the framebuffer */
  #endif

nouveau-multiple-xserver.patch:

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-multiple-xserver.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nouveau-multiple-xserver.patch	20 Apr 2009 23:06:47 -0000	1.4
+++ nouveau-multiple-xserver.patch	1 May 2009 05:58:20 -0000	1.5
@@ -1,4 +1,4 @@
-From e278ea7300169355b17b17a785aef938c3fbc1e3 Mon Sep 17 00:00:00 2001
+From 21d8dee1feb667a38296d087aa5ce355b8ce7b17 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:25:25 +1000
 Subject: [PATCH 3/6] f11: hack to support multiple xserver instances

nouveau-nv50-fb-accel.patch:

Index: nouveau-nv50-fb-accel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-nv50-fb-accel.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nouveau-nv50-fb-accel.patch	20 Apr 2009 23:06:47 -0000	1.4
+++ nouveau-nv50-fb-accel.patch	1 May 2009 05:58:20 -0000	1.5
@@ -1,4 +1,4 @@
-From e31aa5217c97dfd1e2c678ce7391fcd255abb0bf Mon Sep 17 00:00:00 2001
+From 376840ad928ea51a5952bd1461b119e24d957b84 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:30:38 +1000
 Subject: [PATCH 4/6] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout
@@ -156,7 +156,7 @@ index b7bcc87..aee2794 100644
  	exa->WaitMarker = nouveau_exa_wait_marker;
  
 diff --git a/src/nv50_randr.c b/src/nv50_randr.c
-index 8a9281b..538c883 100644
+index 3459f05..61b9e79 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
@@ -571,7 +571,7 @@ index 9f4c96f..a280257 100644
  		return vgaHWSaveScreen(pScreen, mode);
  
 diff --git a/src/nv_proto.h b/src/nv_proto.h
-index 072c7c4..4e9b65c 100644
+index 614fa72..4e07aae 100644
 --- a/src/nv_proto.h
 +++ b/src/nv_proto.h
 @@ -267,6 +267,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool);

nouveau-nv50-nva0-noaccel.patch:

Index: nouveau-nv50-nva0-noaccel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-nv50-nva0-noaccel.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nouveau-nv50-nva0-noaccel.patch	20 Apr 2009 23:06:47 -0000	1.4
+++ nouveau-nv50-nva0-noaccel.patch	1 May 2009 05:58:20 -0000	1.5
@@ -1,4 +1,4 @@
-From 7460d8ebca84bd5e7c26e88143f14f4909598b68 Mon Sep 17 00:00:00 2001
+From 6ce46f688243aaa010bb18642f32a18e4eeea77a Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 20:20:39 +1000
 Subject: [PATCH 5/6] nv50/f11: disable acceleration on NVAx chipsets

nouveau-store-vbios.patch:

Index: nouveau-store-vbios.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-store-vbios.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nouveau-store-vbios.patch	20 Apr 2009 23:06:47 -0000	1.4
+++ nouveau-store-vbios.patch	1 May 2009 05:58:20 -0000	1.5
@@ -1,4 +1,4 @@
-From 514eb5a03b8ca223a4d832e1675cda3a6a56b02d Mon Sep 17 00:00:00 2001
+From ce581a86984390d77863d91ce4c05886980ee982 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:13:26 +1000
 Subject: [PATCH 2/6] bios/f11: store a copy of used vbios image in /var/run
@@ -8,7 +8,7 @@ Subject: [PATCH 2/6] bios/f11: store a c
  1 files changed, 13 insertions(+), 0 deletions(-)
 
 diff --git a/src/nv_bios.c b/src/nv_bios.c
-index ebf4027..ad4ff1f 100644
+index cc5f5c4..2d4169c 100644
 --- a/src/nv_bios.c
 +++ b/src/nv_bios.c
 @@ -22,6 +22,9 @@
@@ -21,7 +21,7 @@ index ebf4027..ad4ff1f 100644
  #include "nv_include.h"
  
  #if defined(__FreeBSD__) || defined(__NetBSD__)
-@@ -4492,7 +4495,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
+@@ -4680,7 +4683,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
  
  bool NVInitVBIOS(ScrnInfoPtr pScrn)
  {
@@ -32,7 +32,7 @@ index ebf4027..ad4ff1f 100644
  
  	memset(bios, 0, sizeof(struct nvbios));
  
-@@ -4503,6 +4509,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+@@ -4691,6 +4697,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
  	if (bios->length > NV_PROM_SIZE)
  		bios->length = NV_PROM_SIZE;
  

nouveau-transition-hack.patch:

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-transition-hack.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nouveau-transition-hack.patch	20 Apr 2009 23:06:47 -0000	1.4
+++ nouveau-transition-hack.patch	1 May 2009 05:58:20 -0000	1.5
@@ -1,4 +1,4 @@
-From 98cd8bd95073e6248a0f63a2b5299736e6d097ef Mon Sep 17 00:00:00 2001
+From 76ec695211c0337f96731f85554d3f299e9ef2dc Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Mon, 13 Apr 2009 19:12:25 +1000
 Subject: [PATCH 1/6] kms/f11: hack in transition support without driver pixmaps


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	20 Apr 2009 23:06:47 -0000	1.35
+++ sources	1 May 2009 05:58:20 -0000	1.36
@@ -1 +1 @@
-0f0047cd0a3c84101b025082f0441ae6  xf86-video-nouveau-0.0.12-20090421git47bb00f.tar.bz2
+3ad8e3ca4568ae7017c9c462a613fdc0  xf86-video-nouveau-0.0.12-20090501gitf69b34a.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- xorg-x11-drv-nouveau.spec	21 Apr 2009 05:10:01 -0000	1.43
+++ xorg-x11-drv-nouveau.spec	1 May 2009 05:58:20 -0000	1.44
@@ -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 20090421
-%define git_version 47bb00f
+%define gitdate 20090501
+%define git_version f69b34a
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,7 +19,7 @@ Name:      xorg-x11-drv-nouveau
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   31.%{snapshot}%{?dist}
+Release:   32.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Fri May 01 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-32.20090501gitf69b34a
+- upstream update fixing serious issues in nv50 output setup
+
 * Mon Apr 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-31.20090421git47bb00f
 - fix for rh#496559
 




More information about the scm-commits mailing list