rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.47, 1.48 nouveau-bicubic-2x.patch, 1.15, 1.16 nouveau-multiple-xserver.patch, 1.17, 1.18 nouveau-tile7000.patch, 1.5, 1.6 sources, 1.48, 1.49 xorg-x11-drv-nouveau.spec, 1.60, 1.61
Ben Skeggs
bskeggs at fedoraproject.org
Tue Sep 29 01:38:16 UTC 2009
- Previous message (by thread): rpms/skkdic/devel .cvsignore, 1.4, 1.5 skkdic.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message (by thread): rpms/control-center/devel apply-extra-translations, NONE, 1.1 extra-translations, NONE, 1.1 control-center.spec, 1.492, 1.493
- 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-serv15740
Modified Files:
.cvsignore nouveau-bicubic-2x.patch
nouveau-multiple-xserver.patch nouveau-tile7000.patch sources
xorg-x11-drv-nouveau.spec
Log Message:
* Tue Sep 29 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-13.20090929gitdd8339f
- fix driver to work again with recent EXA changes
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore 25 Sep 2009 07:17:35 -0000 1.47
+++ .cvsignore 29 Sep 2009 01:38:15 -0000 1.48
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090924gitde0b095.tar.bz2
+xf86-video-nouveau-0.0.15-20090929gitdd8339f.tar.bz2
nouveau-bicubic-2x.patch:
nv30_xv_tex.c | 2 +-
nv40_xv_tex.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- nouveau-bicubic-2x.patch 25 Sep 2009 07:17:35 -0000 1.15
+++ nouveau-bicubic-2x.patch 29 Sep 2009 01:38:15 -0000 1.16
@@ -1,4 +1,4 @@
-From cdfb2dd95e0c70d0467d6c1c21e1b2a21e8f6d58 Mon Sep 17 00:00:00 2001
+From 0c60f12c250e244d5d6a245c0df3b941a176aa59 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 2/3] xv: only use bicubic filtering when scaling >=2x
nouveau-multiple-xserver.patch:
nv_driver.c | 85 ++++++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 57 insertions(+), 28 deletions(-)
Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- nouveau-multiple-xserver.patch 25 Sep 2009 07:17:35 -0000 1.17
+++ nouveau-multiple-xserver.patch 29 Sep 2009 01:38:15 -0000 1.18
@@ -1,4 +1,4 @@
-From 4a82ffa7ea561a68807a1b53e8ebb2f710c3e4a0 Mon Sep 17 00:00:00 2001
+From e81556ab7611efd9977f16a00ee09a194eb5bce1 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Sun, 28 Jun 2009 20:35:54 +1000
Subject: [PATCH 1/3] f12: hack to support multiple xserver instances
@@ -8,7 +8,7 @@ Subject: [PATCH 1/3] f12: hack to suppor
1 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 9317b5e..37a8da7 100644
+index 879d971..e57a696 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -21,6 +21,7 @@
@@ -48,7 +48,7 @@ index 9317b5e..37a8da7 100644
ret = drmDropMaster(nouveau_device(pNv->dev)->fd);
if (ret)
ErrorF("Error dropping master: %d\n", ret);
-@@ -1185,6 +1191,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1187,6 +1193,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
static Bool
@@ -101,7 +101,7 @@ index 9317b5e..37a8da7 100644
NVMapMem(ScrnInfoPtr pScrn)
{
NVPtr pNv = NVPTR(pScrn);
-@@ -1224,6 +1276,9 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1226,6 +1278,9 @@ NVMapMem(ScrnInfoPtr pScrn)
goto skip_offscreen_gart;
if (!pNv->exa_driver_pixmaps) {
@@ -111,7 +111,7 @@ index 9317b5e..37a8da7 100644
size = (pNv->VRAMPhysicalSize / 2) - size;
if (pNv->Architecture >= NV_ARCH_50) {
-@@ -1240,6 +1295,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1242,6 +1297,7 @@ NVMapMem(ScrnInfoPtr pScrn)
return FALSE;
}
@@ -119,7 +119,7 @@ index 9317b5e..37a8da7 100644
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Allocated %dMiB VRAM for offscreen pixmaps\n",
(uint32_t)(pNv->offscreen->size >> 20));
-@@ -1249,32 +1305,6 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1251,32 +1307,6 @@ NVMapMem(ScrnInfoPtr pScrn)
nouveau_bo_unmap(pNv->offscreen);
}
nouveau-tile7000.patch:
drmmode_display.c | 4 ++--
nv_driver.c | 7 ++++++-
nv_type.h | 3 ++-
3 files changed, 10 insertions(+), 4 deletions(-)
Index: nouveau-tile7000.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-tile7000.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-tile7000.patch 25 Sep 2009 07:17:35 -0000 1.5
+++ nouveau-tile7000.patch 29 Sep 2009 01:38:15 -0000 1.6
@@ -1,4 +1,4 @@
-From 9ca71674c32fec89576e8d469a07b2cbab542e95 Mon Sep 17 00:00:00 2001
+From 682b24f8d6fb5053ed8b89cacaaca4dd25c03a16 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Wed, 9 Sep 2009 16:26:25 +1000
Subject: [PATCH 3/3] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption
@@ -32,7 +32,7 @@ index 82b86c4..1157221 100644
pitch = NOUVEAU_ALIGN(width * (scrn->bitsPerPixel >> 3), 64);
} else {
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 37a8da7..b2a24d7 100644
+index e57a696..e0c1c10 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -696,6 +696,7 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
@@ -54,9 +54,9 @@ index 37a8da7..b2a24d7 100644
/* Check if KMS is enabled before we do anything, we don't want to
* go stomping on registers behind its back
*/
-@@ -1254,7 +1259,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1256,7 +1261,7 @@ NVMapMem(ScrnInfoPtr pScrn)
size = pScrn->displayWidth * (pScrn->bitsPerPixel >> 3);
- if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
+ if (pNv->Architecture >= NV_ARCH_50 && pNv->tiled_scanout) {
tile_mode = 4;
- tile_flags = pScrn->bitsPerPixel == 16 ? 0x7000 : 0x7a00;
+ tile_flags = (pScrn->bitsPerPixel == 16 || pNv->pf_ok) ? 0x7000 : 0x7a00;
@@ -64,7 +64,7 @@ index 37a8da7..b2a24d7 100644
} else {
size *= pScrn->virtualY;
diff --git a/src/nv_type.h b/src/nv_type.h
-index 68c415f..e24f30c 100644
+index ddf121c..6e1f2f3 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
@@ -113,6 +113,8 @@ typedef struct _NVRec {
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources 25 Sep 2009 07:17:35 -0000 1.48
+++ sources 29 Sep 2009 01:38:15 -0000 1.49
@@ -1 +1 @@
-448ccbf11d9cbe2c7ed19bd5669baf10 xf86-video-nouveau-0.0.15-20090924gitde0b095.tar.bz2
+e98437442d84c9ca595adc6ae9665eff xf86-video-nouveau-0.0.15-20090929gitdd8339f.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.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- xorg-x11-drv-nouveau.spec 25 Sep 2009 07:17:35 -0000 1.60
+++ xorg-x11-drv-nouveau.spec 29 Sep 2009 01:38:15 -0000 1.61
@@ -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 20090924
-%define git_version de0b095
+%define gitdate 20090929
+%define git_version dd8339f
%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: 12.%{snapshot}%{?dist}
+Release: 13.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/nouveau.4*
%changelog
+* Tue Sep 29 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-13.20090929gitdd8339f
+- fix driver to work again with recent EXA changes
+
* Fri Sep 25 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-12.20090924gitde0b095
- G80: small performance fix
- Previous message (by thread): rpms/skkdic/devel .cvsignore, 1.4, 1.5 skkdic.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message (by thread): rpms/control-center/devel apply-extra-translations, NONE, 1.1 extra-translations, NONE, 1.1 control-center.spec, 1.492, 1.493
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list