rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.37, 1.38 nouveau-bicubic-2x.patch, 1.4, 1.5 nouveau-multiple-xserver.patch, 1.6, 1.7 nouveau-transition-hack.patch, 1.7, 1.8 sources, 1.38, 1.39 xorg-x11-drv-nouveau.spec, 1.47, 1.48
Ben Skeggs
bskeggs at fedoraproject.org
Tue Aug 4 06:52:53 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20570
Modified Files:
.cvsignore nouveau-bicubic-2x.patch
nouveau-multiple-xserver.patch nouveau-transition-hack.patch
sources xorg-x11-drv-nouveau.spec
Log Message:
* Tue Aug 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-1.20090803git619103a
- upstream update, misc fixes
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore 28 Jul 2009 15:32:17 -0000 1.37
+++ .cvsignore 4 Aug 2009 06:52:52 -0000 1.38
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090728git4d20547.tar.bz2
+xf86-video-nouveau-0.0.15-20090803git619103a.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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nouveau-bicubic-2x.patch 28 Jul 2009 16:04:07 -0000 1.4
+++ nouveau-bicubic-2x.patch 4 Aug 2009 06:52:52 -0000 1.5
@@ -1,4 +1,4 @@
-From d1aaf21efe356bc70d19a46cba3f22f951a4468e Mon Sep 17 00:00:00 2001
+From 9eed08a8ebccf41c5b65c66a15806fd755249106 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 3/3] xv: only use bicubic filtering when scaling >=2x
@@ -35,5 +35,5 @@ index 3d1f146..e0efb41 100644
else
NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
--
-1.6.3.3
+1.6.4
nouveau-multiple-xserver.patch:
nv_driver.c | 92 +++++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 64 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.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nouveau-multiple-xserver.patch 28 Jul 2009 15:32:18 -0000 1.6
+++ nouveau-multiple-xserver.patch 4 Aug 2009 06:52:52 -0000 1.7
@@ -1,14 +1,14 @@
-From 7c58a69d5f6d86d1170170e8154fa7bbe9226c2c Mon Sep 17 00:00:00 2001
+From e90a14ed87748789557583187d6bb3d96c6d117f 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
---
- src/nv_driver.c | 97 ++++++++++++++++++++++++++++++++++++++++---------------
- 1 files changed, 71 insertions(+), 26 deletions(-)
+ src/nv_driver.c | 91 ++++++++++++++++++++++++++++++++++++++----------------
+ 1 files changed, 64 insertions(+), 27 deletions(-)
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 838fc67..35233dc 100644
+index ad45d19..2ab42e1 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -21,6 +21,7 @@
@@ -19,7 +19,7 @@ index 838fc67..35233dc 100644
#include "nv_include.h"
-@@ -377,14 +378,27 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
+@@ -377,16 +378,24 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
*/
/* Mandatory */
@@ -33,35 +33,35 @@ index 838fc67..35233dc 100644
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVEnterVT is called.\n");
-+ if (pNv->dev) {
-+ ret = ioctl(nouveau_device(pNv->dev)->fd,
-+ DRM_IOCTL_SET_MASTER, NULL);
-+ if (ret) {
-+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+ "Unable to set master\n");
-+ }
+- if (!pNv->NoAccel)
++ ret = ioctl(nouveau_device(pNv->dev)->fd, DRM_IOCTL_SET_MASTER, NULL);
++ if (ret)
++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to set master\n");
+
++ if (!pNv->NoAccel) {
+ NVMapMemGART(pScrn);
-+ }
-+
- if (!pNv->NoAccel)
NVAccelCommonInit(pScrn);
++ }
-@@ -436,6 +450,13 @@ NVLeaveVT(int scrnIndex, int flags)
+ if (!pNv->kms_enable) {
+ /* Save current state, VGA fonts etc */
+@@ -429,11 +438,15 @@ NVLeaveVT(int scrnIndex, int flags)
+ {
+ ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ NVPtr pNv = NVPTR(pScrn);
++ struct nouveau_device_priv *nvdev = nouveau_device(pNv->dev);
+
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVLeaveVT is called.\n");
NVSync(pScrn);
-+ if (pNv->dev) {
-+ struct nouveau_device_priv *nvdev = nouveau_device(pNv->dev);
-+
-+ nouveau_bo_ref(NULL, &pNv->GART);
-+ ioctl(nvdev->fd, DRM_IOCTL_DROP_MASTER, NULL);
-+ }
++ nouveau_bo_ref(NULL, &pNv->GART);
++ ioctl(nvdev->fd, DRM_IOCTL_DROP_MASTER, NULL);
+
if (!pNv->kms_enable) {
if (pNv->Architecture < NV_ARCH_50)
NVRestore(pScrn);
-@@ -1114,6 +1135,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1172,6 +1185,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
static Bool
@@ -114,8 +114,8 @@ index 838fc67..35233dc 100644
NVMapMem(ScrnInfoPtr pScrn)
{
NVPtr pNv = NVPTR(pScrn);
-@@ -1150,6 +1217,9 @@ NVMapMem(ScrnInfoPtr pScrn)
- nouveau_bo_unmap(pNv->scanout);
+@@ -1211,6 +1270,9 @@ NVMapMem(ScrnInfoPtr pScrn)
+ goto skip_offscreen_gart;
if (!pNv->exa_driver_pixmaps) {
+ if (NVMapMemSharedFB(pScrn))
@@ -124,7 +124,7 @@ index 838fc67..35233dc 100644
size = (pNv->VRAMPhysicalSize / 2) - size;
if (pNv->Architecture >= NV_ARCH_50) {
-@@ -1166,6 +1236,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1227,6 +1289,7 @@ NVMapMem(ScrnInfoPtr pScrn)
return FALSE;
}
@@ -132,7 +132,7 @@ index 838fc67..35233dc 100644
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Allocated %dMiB VRAM for offscreen pixmaps\n",
(uint32_t)(pNv->offscreen->size >> 20));
-@@ -1175,32 +1246,6 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1236,32 +1299,6 @@ NVMapMem(ScrnInfoPtr pScrn)
nouveau_bo_unmap(pNv->offscreen);
}
@@ -162,9 +162,9 @@ index 838fc67..35233dc 100644
- (unsigned int)(pNv->GART->size >> 20));
- }
-
+ skip_offscreen_gart:
/* We don't need to allocate cursors / lut here if we're using
* kernel modesetting
- **/
--
-1.6.3.3
+1.6.4
nouveau-transition-hack.patch:
drmmode_display.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 169 insertions(+), 3 deletions(-)
Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-transition-hack.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-transition-hack.patch 28 Jul 2009 16:04:07 -0000 1.7
+++ nouveau-transition-hack.patch 4 Aug 2009 06:52:52 -0000 1.8
@@ -1,17 +1,17 @@
-From bf1e465874dbd36b7de3493a69717b292353d648 Mon Sep 17 00:00:00 2001
+From e2d92e84979a51eaedb87ca9b8e44699f0166c7e Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Tue, 30 Jun 2009 10:52:07 +1000
Subject: [PATCH 2/3] f12: transitions
---
- src/drmmode_display.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 147 insertions(+), 2 deletions(-)
+ src/drmmode_display.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 169 insertions(+), 2 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 21ed564..ae3c51d 100644
+index de1fa00..cbc97c8 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
-@@ -172,6 +172,144 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
+@@ -172,6 +172,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
}
static void
@@ -103,15 +103,25 @@ index 21ed564..ae3c51d 100644
+
+ BEGIN_RING(chan, eng2d, 0x02ac, 1);
+ OUT_RING (chan, 3);
-+ BEGIN_RING(chan, eng2d, 0x0200, 5);
-+ OUT_RING (chan, depth_to_gpu(pScrn->depth));
-+ OUT_RING (chan, 0);
-+ OUT_RING (chan, 0x40);
-+ OUT_RING (chan, 1);
-+ OUT_RING (chan, 0);
-+ BEGIN_RING(chan, eng2d, 0x0218, 4);
-+ OUT_RING (chan, pScrn->virtualX);
-+ OUT_RING (chan, pScrn->virtualY);
++ if (dst->tile_flags) {
++ BEGIN_RING(chan, eng2d, 0x0200, 5);
++ OUT_RING (chan, depth_to_gpu(pScrn->depth));
++ OUT_RING (chan, 0);
++ OUT_RING (chan, dst->tile_mode << 4);
++ OUT_RING (chan, 1);
++ OUT_RING (chan, 0);
++ BEGIN_RING(chan, eng2d, 0x0218, 4);
++ OUT_RING (chan, pScrn->virtualX);
++ OUT_RING (chan, pScrn->virtualY);
++ } else {
++ BEGIN_RING(chan, eng2d, 0x0200, 2);
++ OUT_RING (chan, depth_to_gpu(pScrn->depth));
++ OUT_RING (chan, 1);
++ BEGIN_RING(chan, eng2d, 0x0214, 5);
++ OUT_RING (chan, pScrn->displayWidth * pScrn->bitsPerPixel / 8);
++ OUT_RING (chan, pScrn->virtualX);
++ OUT_RING (chan, pScrn->virtualY);
++ }
+ OUT_RELOCh(chan, dst, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+ OUT_RELOCl(chan, dst, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+ BEGIN_RING(chan, eng2d, 0x0280, 4);
@@ -119,13 +129,25 @@ index 21ed564..ae3c51d 100644
+ OUT_RING (chan, 0);
+ OUT_RING (chan, pScrn->virtualX);
+ OUT_RING (chan, pScrn->virtualY);
-+ BEGIN_RING(chan, eng2d, 0x0230, 2);
-+ OUT_RING (chan, depth_to_gpu(fb->depth));
-+ OUT_RING (chan, 1);
-+ BEGIN_RING(chan, eng2d, 0x0244, 5);
-+ OUT_RING (chan, fb->pitch);
-+ OUT_RING (chan, fb->width);
-+ OUT_RING (chan, fb->height);
++ if (src->tile_flags) {
++ BEGIN_RING(chan, eng2d, 0x0230, 5);
++ OUT_RING (chan, depth_to_gpu(fb->depth));
++ OUT_RING (chan, 0);
++ OUT_RING (chan, src->tile_mode << 4);
++ OUT_RING (chan, 1);
++ OUT_RING (chan, 0);
++ BEGIN_RING(chan, eng2d, 0x0248, 4);
++ OUT_RING (chan, fb->width);
++ OUT_RING (chan, fb->height);
++ } else {
++ BEGIN_RING(chan, eng2d, 0x0230, 2);
++ OUT_RING (chan, depth_to_gpu(fb->depth));
++ OUT_RING (chan, 1);
++ BEGIN_RING(chan, eng2d, 0x0244, 5);
++ OUT_RING (chan, fb->pitch);
++ OUT_RING (chan, fb->width);
++ OUT_RING (chan, fb->height);
++ }
+ OUT_RELOCh(chan, src, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+ OUT_RELOCl(chan, src, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+ BEGIN_RING(chan, eng2d, 0x0110, 1);
@@ -156,7 +178,7 @@ index 21ed564..ae3c51d 100644
drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
int x, int y)
{
-@@ -184,6 +322,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -184,6 +344,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
if (!src_id || !dst_id)
return;
@@ -171,7 +193,7 @@ index 21ed564..ae3c51d 100644
pspix = drmmode_fb_pixmap(pScrn, src_id, &w, &h);
if (!pspix)
return;
-@@ -285,8 +431,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -285,8 +453,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
x = 0;
y = 0;
} else
@@ -182,5 +204,5 @@ index 21ed564..ae3c51d 100644
drmmode_crtc->mode_crtc->buffer_id, x, y);
}
--
-1.6.3.3
+1.6.4
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources 28 Jul 2009 15:32:18 -0000 1.38
+++ sources 4 Aug 2009 06:52:52 -0000 1.39
@@ -1 +1 @@
-b37bfc0e2b040b16efaf9f00431d556a xf86-video-nouveau-0.0.15-20090728git4d20547.tar.bz2
+edc867f0c964a749e7b535a6a26ad0f6 xf86-video-nouveau-0.0.15-20090803git619103a.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.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- xorg-x11-drv-nouveau.spec 28 Jul 2009 15:32:18 -0000 1.47
+++ xorg-x11-drv-nouveau.spec 4 Aug 2009 06:52:52 -0000 1.48
@@ -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 20090728
-%define git_version 4d20547
+%define gitdate 20090803
+%define git_version 619103a
%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: 0.%{snapshot}%{?dist}
+Release: 1.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/nouveau.4*
%changelog
+* Tue Aug 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-1.20090803git619103a
+- upstream update, misc fixes
+
* Tue Jul 28 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-0.20090728git4d20547
- Update to latest upstream
More information about the fedora-extras-commits
mailing list