rpms/xorg-x11-drv-nouveau/F-11 nouveau-bicubic-2x.patch, 1.5, 1.6 nouveau-fb-resize.patch, 1.9, 1.10 nouveau-multiple-xserver.patch, 1.9, 1.10 nouveau-nv50-fb-accel.patch, 1.9, 1.10 nouveau-nv50-nva0-noaccel.patch, 1.9, 1.10 nouveau-store-vbios.patch, 1.9, 1.10 nouveau-transition-hack.patch, 1.9, 1.10 xorg-x11-drv-nouveau.spec, 1.49, 1.50
Ben Skeggs
bskeggs at fedoraproject.org
Sun May 24 22:50:21 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28813
Modified Files:
nouveau-bicubic-2x.patch 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 xorg-x11-drv-nouveau.spec
Log Message:
* Mon May 25 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-38.20090525gitdb9ff95
- rh#502371 - don't treat lack of fp table as an error on any chipset
- some minor changes to fix issues with pre-nv5x kms
nouveau-bicubic-2x.patch:
Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11/nouveau-bicubic-2x.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-bicubic-2x.patch 18 May 2009 09:33:15 -0000 1.5
+++ nouveau-bicubic-2x.patch 24 May 2009 22:50:17 -0000 1.6
@@ -1,4 +1,4 @@
-From 49cc849cbfdbf8f8c74233797e3ef6310a922098 Mon Sep 17 00:00:00 2001
+From ca31642a21dd13ed159a062ae894246a42d033f2 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <skeggsb at beleth.localdomain>
Date: Mon, 4 May 2009 17:04:34 +1000
Subject: [PATCH 7/8] xv: only use bicubic filtering when scaling >=2x
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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nouveau-fb-resize.patch 18 May 2009 09:33:15 -0000 1.9
+++ nouveau-fb-resize.patch 24 May 2009 22:50:17 -0000 1.10
@@ -1,4 +1,4 @@
-From 249310ced36645ac060ebbfc7dded1d139ead55d Mon Sep 17 00:00:00 2001
+From b54aeab191625d82e38a3170bb4061255f502ff8 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/8] f11: support framebuffer resize without driver pixmaps
@@ -13,10 +13,10 @@ Subject: [PATCH 6/8] f11: support frameb
6 files changed, 224 insertions(+), 34 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index ca1a60b..c666c9f 100644
+index aef4886..7527fe1 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
-@@ -1069,6 +1069,59 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
+@@ -1071,6 +1071,59 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
}
static Bool
@@ -76,7 +76,7 @@ index ca1a60b..c666c9f 100644
drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
{
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
-@@ -1083,10 +1136,23 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
+@@ -1085,10 +1138,23 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
ErrorF("resize called %d %d\n", width, height);
if (!pNv->exa_driver_pixmaps) {
@@ -102,7 +102,7 @@ index ca1a60b..c666c9f 100644
return TRUE;
}
-@@ -1149,7 +1215,7 @@ static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
+@@ -1151,7 +1217,7 @@ static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
{
@@ -111,7 +111,7 @@ index ca1a60b..c666c9f 100644
drmmode_ptr drmmode;
int i;
-@@ -1173,8 +1239,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
+@@ -1175,8 +1241,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
for (i = 0; i < drmmode->mode_res->count_connectors; i++)
drmmode_output_init(pScrn, drmmode, i);
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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nouveau-multiple-xserver.patch 18 May 2009 09:33:16 -0000 1.9
+++ nouveau-multiple-xserver.patch 24 May 2009 22:50:17 -0000 1.10
@@ -1,4 +1,4 @@
-From 35e118a76737a196b7dfe0a63683fe94a4b1661e Mon Sep 17 00:00:00 2001
+From 366acdddcc07a86f600cbf062f4454bf7a185bc3 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/8] 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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nouveau-nv50-fb-accel.patch 18 May 2009 09:33:16 -0000 1.9
+++ nouveau-nv50-fb-accel.patch 24 May 2009 22:50:18 -0000 1.10
@@ -1,4 +1,4 @@
-From 3a9b44986234c62e11dc225e4e5ae05e1487c79c Mon Sep 17 00:00:00 2001
+From ba3136309190c4733f33e5d4ec03726e1d8c0404 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/8] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout
@@ -30,10 +30,10 @@ index 29253a6..0c9e4e9 100644
nouveau_output.h \
nouveau_connector.h \
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 4909e51..ca1a60b 100644
+index 5f6621a..aef4886 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
-@@ -214,8 +214,8 @@ drmmode_fb_copy_sw(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id,
+@@ -216,8 +216,8 @@ drmmode_fb_copy_sw(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id,
}
src = (void *)req.vaddr;
@@ -44,7 +44,7 @@ index 4909e51..ca1a60b 100644
dst += (y * fb->pitch) + (x * (fb->bpp >> 3));
h = fb->height;
-@@ -225,7 +225,7 @@ drmmode_fb_copy_sw(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id,
+@@ -227,7 +227,7 @@ drmmode_fb_copy_sw(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id,
dst += pScrn->displayWidth * (pScrn->bitsPerPixel / 8);
}
@@ -53,7 +53,7 @@ index 4909e51..ca1a60b 100644
drmFree(fb);
}
-@@ -380,7 +380,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -382,7 +382,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
ret = drmModeAddFB(drmmode->fd,
pScrn->virtualX, pScrn->virtualY,
pScrn->depth, pScrn->bitsPerPixel,
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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nouveau-nv50-nva0-noaccel.patch 18 May 2009 09:33:16 -0000 1.9
+++ nouveau-nv50-nva0-noaccel.patch 24 May 2009 22:50:18 -0000 1.10
@@ -1,4 +1,4 @@
-From 36f1dc154cbcc9f6f247f2fd6de8706802f82194 Mon Sep 17 00:00:00 2001
+From 894c67504a51d539406ac61f4d614c7a6ba736de 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/8] 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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nouveau-store-vbios.patch 18 May 2009 09:33:16 -0000 1.9
+++ nouveau-store-vbios.patch 24 May 2009 22:50:18 -0000 1.10
@@ -1,4 +1,4 @@
-From 3f4763af5a48077e2b98888ab8d3383933128697 Mon Sep 17 00:00:00 2001
+From 8338704baa0988a8a144feab1e62e8c9126bb468 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/8] bios/f11: store a copy of used vbios image in /var/run
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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nouveau-transition-hack.patch 18 May 2009 09:33:16 -0000 1.9
+++ nouveau-transition-hack.patch 24 May 2009 22:50:18 -0000 1.10
@@ -1,4 +1,4 @@
-From 14ab3035714b46221c57339ec760f373dab8cc7a Mon Sep 17 00:00:00 2001
+From bc699591adee16317aa494b30fbed9d38c1a5f71 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/8] kms/f11: hack in transition support without driver pixmaps
@@ -8,10 +8,10 @@ Subject: [PATCH 1/8] kms/f11: hack in tr
1 files changed, 142 insertions(+), 2 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index aa8befe..4909e51 100644
+index dbc4bf1..5f6621a 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
-@@ -185,6 +185,139 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
+@@ -187,6 +187,139 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
}
static void
@@ -151,22 +151,22 @@ index aa8befe..4909e51 100644
drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
int x, int y)
{
-@@ -194,6 +327,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -196,6 +329,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
PixmapPtr pspix, pdpix;
- int w, h;
+ unsigned w = -1, h = -1;
+ if (!pNv->exa_driver_pixmaps) {
-+ if (pNv->NoAccel)
++ if (pNv->NoAccel || pNv->Architecture < NV_ARCH_50)
+ drmmode_fb_copy_sw(pScrn, drmmode, dst_id, src_id, x, y);
+ else
+ drmmode_fb_copy_nv50(pScrn, drmmode, dst_id, src_id, x, y);
+ return;
+ }
+
- pspix = drmmode_fb_pixmap(pScrn, src_id, NULL, NULL);
+ pspix = drmmode_fb_pixmap(pScrn, src_id, &w, &h);
if (!pspix)
return;
-@@ -292,8 +433,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -294,8 +435,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
if (drmmode_crtc->rotate_fb_id)
fb_id = drmmode_crtc->rotate_fb_id;
else
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.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xorg-x11-drv-nouveau.spec 18 May 2009 09:33:16 -0000 1.49
+++ xorg-x11-drv-nouveau.spec 24 May 2009 22:50:18 -0000 1.50
@@ -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 20090514
-%define git_version 9656762
+%define gitdate 20090525
+%define git_version db9ff95
%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: 37.%{snapshot}%{?dist}
+Release: 38.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -49,6 +49,7 @@ Patch4: nouveau-nv50-nva0-noaccel.patch
Patch5: dcbconf_7_4_ignore.diff
Patch6: nouveau-fb-resize.patch
Patch7: nouveau-bicubic-2x.patch
+Patch8: nouveau-fptable-noerror.patch
%description
X.Org X11 nouveau video driver.
@@ -64,6 +65,7 @@ X.Org X11 nouveau video driver.
%patch5 -p1 -b .dcbconf
%patch6 -p1 -b .fbresize
%patch7 -p1 -b .bicubic
+%patch8 -p1 -b .fpmode
%build
autoreconf -v --install
@@ -87,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/nouveau.4*
%changelog
+* Mon May 25 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-38.20090525gitdb9ff95
+- rh#502371 - don't treat lack of fp table as an error on any chipset
+- some minor changes to fix issues with pre-nv5x kms
+
* Thu May 18 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-37.20090514git9656762
- <nv50: fix randr rotation
More information about the scm-commits
mailing list