rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.38, 1.39 nouveau-bicubic-2x.patch, 1.5, 1.6 nouveau-multiple-xserver.patch, 1.7, 1.8 nouveau-transition-hack.patch, 1.8, 1.9 sources, 1.39, 1.40 xorg-x11-drv-nouveau.spec, 1.48, 1.49
Ben Skeggs
bskeggs at fedoraproject.org
Wed Aug 5 06:00:26 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30894
Modified Files:
.cvsignore nouveau-bicubic-2x.patch
nouveau-multiple-xserver.patch nouveau-transition-hack.patch
sources xorg-x11-drv-nouveau.spec
Log Message:
* Wed Aug 05 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-2.20090803git712064e
- dri2 fixes, no wfb without kms, non-kms fb resize fixes, other misc fixes
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore 4 Aug 2009 06:52:52 -0000 1.38
+++ .cvsignore 5 Aug 2009 06:00:25 -0000 1.39
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090803git619103a.tar.bz2
+xf86-video-nouveau-0.0.15-20090805git712064e.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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-bicubic-2x.patch 4 Aug 2009 06:52:52 -0000 1.5
+++ nouveau-bicubic-2x.patch 5 Aug 2009 06:00:26 -0000 1.6
@@ -1,4 +1,4 @@
-From 9eed08a8ebccf41c5b65c66a15806fd755249106 Mon Sep 17 00:00:00 2001
+From 23a7cd9fcfc2fdc589e86321d96c2c886fd46991 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
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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-multiple-xserver.patch 4 Aug 2009 06:52:52 -0000 1.7
+++ nouveau-multiple-xserver.patch 5 Aug 2009 06:00:26 -0000 1.8
@@ -1,14 +1,14 @@
-From e90a14ed87748789557583187d6bb3d96c6d117f Mon Sep 17 00:00:00 2001
+From c8327229aa73e2b946d0c1e61f25911f7dd3644b 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 | 91 ++++++++++++++++++++++++++++++++++++++----------------
- 1 files changed, 64 insertions(+), 27 deletions(-)
+ src/nv_driver.c | 84 +++++++++++++++++++++++++++++++++++++-----------------
+ 1 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index ad45d19..2ab42e1 100644
+index 62cba05..06023e2 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -21,6 +21,7 @@
@@ -19,7 +19,7 @@ index ad45d19..2ab42e1 100644
#include "nv_include.h"
-@@ -377,16 +378,24 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
+@@ -377,6 +378,7 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
*/
/* Mandatory */
@@ -27,17 +27,11 @@ index ad45d19..2ab42e1 100644
static Bool
NVEnterVT(int scrnIndex, int flags)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- NVPtr pNv = NVPTR(pScrn);
-+ int ret;
-
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVEnterVT is called.\n");
+@@ -390,8 +392,10 @@ NVEnterVT(int scrnIndex, int flags)
+ if (ret)
+ ErrorF("Unable to get master: %d\n", ret);
- 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);
NVAccelCommonInit(pScrn);
@@ -45,23 +39,16 @@ index ad45d19..2ab42e1 100644
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");
+@@ -440,6 +444,8 @@ NVLeaveVT(int scrnIndex, int flags)
NVSync(pScrn);
+ 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);
-@@ -1172,6 +1185,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+ 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)
static Bool
@@ -114,7 +101,7 @@ index ad45d19..2ab42e1 100644
NVMapMem(ScrnInfoPtr pScrn)
{
NVPtr pNv = NVPTR(pScrn);
-@@ -1211,6 +1270,9 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1224,6 +1276,9 @@ NVMapMem(ScrnInfoPtr pScrn)
goto skip_offscreen_gart;
if (!pNv->exa_driver_pixmaps) {
@@ -124,7 +111,7 @@ index ad45d19..2ab42e1 100644
size = (pNv->VRAMPhysicalSize / 2) - size;
if (pNv->Architecture >= NV_ARCH_50) {
-@@ -1227,6 +1289,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1240,6 +1295,7 @@ NVMapMem(ScrnInfoPtr pScrn)
return FALSE;
}
@@ -132,7 +119,7 @@ index ad45d19..2ab42e1 100644
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Allocated %dMiB VRAM for offscreen pixmaps\n",
(uint32_t)(pNv->offscreen->size >> 20));
-@@ -1236,32 +1299,6 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1249,32 +1305,6 @@ NVMapMem(ScrnInfoPtr pScrn)
nouveau_bo_unmap(pNv->offscreen);
}
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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nouveau-transition-hack.patch 4 Aug 2009 06:52:52 -0000 1.8
+++ nouveau-transition-hack.patch 5 Aug 2009 06:00:26 -0000 1.9
@@ -1,4 +1,4 @@
-From e2d92e84979a51eaedb87ca9b8e44699f0166c7e Mon Sep 17 00:00:00 2001
+From e0b897898184f96a9a8ef8d583b612ea63dbd92b 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
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] f12: transitions
1 files changed, 169 insertions(+), 2 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index de1fa00..cbc97c8 100644
+index 3f04be1..2220d04 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -172,6 +172,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources 4 Aug 2009 06:52:52 -0000 1.39
+++ sources 5 Aug 2009 06:00:26 -0000 1.40
@@ -1 +1 @@
-edc867f0c964a749e7b535a6a26ad0f6 xf86-video-nouveau-0.0.15-20090803git619103a.tar.bz2
+fbae58a5c8b661a84f96b1d6989a6de3 xf86-video-nouveau-0.0.15-20090805git712064e.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.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- xorg-x11-drv-nouveau.spec 4 Aug 2009 06:52:52 -0000 1.48
+++ xorg-x11-drv-nouveau.spec 5 Aug 2009 06:00:26 -0000 1.49
@@ -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 20090803
-%define git_version 619103a
+%define gitdate 20090805
+%define git_version 712064e
%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: 1.%{snapshot}%{?dist}
+Release: 2.%{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
+* Wed Aug 05 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-2.20090803git712064e
+- dri2 fixes, no wfb without kms, non-kms fb resize fixes, other misc fixes
+
* Tue Aug 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-1.20090803git619103a
- upstream update, misc fixes
More information about the fedora-extras-commits
mailing list