rpms/xorg-x11-drv-nouveau/F-11 nouveau-bicubic-2x.patch, 1.4, 1.5 nouveau-fb-resize.patch, 1.8, 1.9 nouveau-multiple-xserver.patch, 1.8, 1.9 nouveau-nv50-fb-accel.patch, 1.8, 1.9 nouveau-nv50-nva0-noaccel.patch, 1.8, 1.9 nouveau-store-vbios.patch, 1.8, 1.9 nouveau-transition-hack.patch, 1.8, 1.9 xorg-x11-drv-nouveau.spec, 1.48, 1.49
Ben Skeggs
bskeggs at fedoraproject.org
Mon May 18 09:33:17 UTC 2009
- Previous message (by thread): rpms/trackballs-music/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 trackballs-music.spec, 1.4, 1.5
- Next message (by thread): rpms/libgphoto2/devel .cvsignore, 1.8, 1.9 libgphoto2.spec, 1.20, 1.21 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11485
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:
* Thu May 18 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-37.20090514git9656762
- <nv50: fix randr rotation
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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nouveau-bicubic-2x.patch 14 May 2009 12:53:09 -0000 1.4
+++ nouveau-bicubic-2x.patch 18 May 2009 09:33:15 -0000 1.5
@@ -1,7 +1,7 @@
-From 960fca4b7349b7d0650c4c51fb67ae7317e4a2a3 Mon Sep 17 00:00:00 2001
+From 49cc849cbfdbf8f8c74233797e3ef6310a922098 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/7] xv: only use bicubic filtering when scaling >=2x
+Subject: [PATCH 7/8] xv: only use bicubic filtering when scaling >=2x
---
src/nv30_xv_tex.c | 2 +-
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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nouveau-fb-resize.patch 14 May 2009 12:53:09 -0000 1.8
+++ nouveau-fb-resize.patch 18 May 2009 09:33:15 -0000 1.9
@@ -1,16 +1,16 @@
-From 8a9595d4736cdcbd41dc387e763345227ab83c16 Mon Sep 17 00:00:00 2001
+From 249310ced36645ac060ebbfc7dded1d139ead55d 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/7] f11: support framebuffer resize without driver pixmaps
+Subject: [PATCH 6/8] f11: support framebuffer resize without driver pixmaps
---
src/drmmode_display.c | 75 +++++++++++++++++++++++++++++++--
src/nouveau_exa.c | 21 +++++-----
src/nv50_randr.c | 13 +++++-
- src/nv_crtc.c | 16 ++++++-
+ src/nv_crtc.c | 31 +++++++++-----
src/nv_driver.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++---
- src/nv_type.h | 9 ++++-
- 6 files changed, 216 insertions(+), 26 deletions(-)
+ src/nv_type.h | 10 ++++-
+ 6 files changed, 224 insertions(+), 34 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index ca1a60b..c666c9f 100644
@@ -122,7 +122,7 @@ index ca1a60b..c666c9f 100644
}
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
-index cf050f9..adf854b 100644
+index cf050f9..cae3a3f 100644
--- a/src/nouveau_exa.c
+++ b/src/nouveau_exa.c
@@ -279,7 +279,10 @@ nouveau_exa_prepare_access(PixmapPtr ppix, int index)
@@ -166,7 +166,7 @@ index cf050f9..adf854b 100644
- exa->offScreenBase = NOUVEAU_ALIGN(pScrn->virtualX, 64) *
- NOUVEAU_ALIGN(pScrn->virtualY, 64) *
- (pScrn->bitsPerPixel / 8);
-+ exa->offScreenBase = 0;
++ exa->offScreenBase = 0x1000; /* just a little to keep "0" special */
exa->memorySize = pNv->FB->size;
if (pNv->Architecture < NV_ARCH_50) {
@@ -209,10 +209,67 @@ index e66b24a..4c770ee 100644
NV50DisplayCommand(pScrn, NV50_UPDATE_DISPLAY, 0);
}
diff --git a/src/nv_crtc.c b/src/nv_crtc.c
-index 83d5e40..9bac9de 100644
+index 83d5e40..01462c2 100644
--- a/src/nv_crtc.c
+++ b/src/nv_crtc.c
-@@ -1153,7 +1153,10 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
+@@ -952,7 +952,7 @@ nv_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
+ unsigned long rotate_pitch;
+ int size, align = 64;
+
+- rotate_pitch = pScrn->displayWidth * (pScrn->bitsPerPixel/8);
++ rotate_pitch = NOUVEAU_ALIGN(width, align) * (pScrn->bitsPerPixel/8);
+ size = rotate_pitch * height;
+
+ assert(nv_crtc->shadow == NULL);
+@@ -985,6 +985,7 @@ nv_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
+ offset = pNv->FBMap + nv_crtc->shadow->offset;
+ #endif /* NOUVEAU_EXA_PIXMAPS */
+
++ nv_crtc->shadow_pitch = rotate_pitch;
+ return offset;
+ }
+
+@@ -995,11 +996,10 @@ static PixmapPtr
+ nv_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
+ {
+ ScrnInfoPtr pScrn = crtc->scrn;
++ struct nouveau_crtc *nv_crtc = to_nouveau_crtc(crtc);
+ #if NOUVEAU_EXA_PIXMAPS
+ ScreenPtr pScreen = pScrn->pScreen;
+- struct nouveau_crtc *nv_crtc = to_nouveau_crtc(crtc);
+ #endif /* NOUVEAU_EXA_PIXMAPS */
+- unsigned long rotate_pitch;
+ PixmapPtr rotate_pixmap;
+ #if NOUVEAU_EXA_PIXMAPS
+ struct nouveau_pixmap *nvpix;
+@@ -1008,8 +1008,6 @@ nv_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
+ if (!data)
+ data = crtc->funcs->shadow_allocate (crtc, width, height);
+
+- rotate_pitch = pScrn->displayWidth * (pScrn->bitsPerPixel/8);
+-
+ #if NOUVEAU_EXA_PIXMAPS
+ /* Create a dummy pixmap, to get a private that will be accepted by the system.*/
+ rotate_pixmap = pScreen->CreatePixmap(pScreen,
+@@ -1026,7 +1024,7 @@ nv_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
+ width, height,
+ pScrn->depth,
+ pScrn->bitsPerPixel,
+- rotate_pitch,
++ nv_crtc->shadow_pitch,
+ data);
+ #endif /* NOUVEAU_EXA_PIXMAPS */
+
+@@ -1050,7 +1048,7 @@ nv_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
+ height,
+ pScrn->depth,
+ pScrn->bitsPerPixel,
+- rotate_pitch,
++ nv_crtc->rotate_pitch,
+ data);
+
+ nvpix = exaGetPixmapDriverPrivate(rotate_pixmap);
+@@ -1153,16 +1151,29 @@ 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);
@@ -222,14 +279,16 @@ index 83d5e40..9bac9de 100644
+ uint32_t pitch = pScrn->displayWidth * cpp;
+ NVCrtcRegPtr regp = &pNv->ModeReg.crtc_reg[nv_crtc->head];
- if (crtc->rotatedData != NULL) /* we do not exist on the real framebuffer */
+- if (crtc->rotatedData != NULL) /* we do not exist on the real framebuffer */
++ if (crtc->rotatedData != NULL) { /* we do not exist on the real framebuffer */
#if NOUVEAU_EXA_PIXMAPS
-@@ -1161,8 +1164,17 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
+ start = nv_crtc->shadow->offset;
#else
start = pNv->FB->offset + nv_crtc->shadow->offset; /* We do exist relative to the framebuffer */
#endif
- else
-+ else {
++ pitch = nv_crtc->shadow_pitch;
++ } else {
+ if (pNv->exa_onscreen)
+ start += pNv->exa_onscreen->offset;
start += pNv->FB->offset;
@@ -375,10 +434,18 @@ index 52fe1e2..e91bb15 100644
}
diff --git a/src/nv_type.h b/src/nv_type.h
-index b79474e..cc5bef7 100644
+index b79474e..97d6912 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
-@@ -305,8 +305,11 @@ typedef struct _NVRec {
+@@ -212,6 +212,7 @@ struct nouveau_crtc {
+ int head;
+ uint8_t last_dpms;
+ ExaOffscreenArea *shadow;
++ unsigned shadow_pitch;
+ int fp_users;
+ uint32_t dpms_saved_fp_control;
+ int saturation, sharpness;
+@@ -305,8 +306,11 @@ typedef struct _NVRec {
volatile CARD8 *PDIO1;
uint8_t cur_head;
@@ -390,7 +457,7 @@ index b79474e..cc5bef7 100644
ScreenBlockHandlerProcPtr BlockHandler;
CloseScreenProcPtr CloseScreen;
/* Cursor */
-@@ -495,11 +498,15 @@ nouveau_pixmap_offset(PixmapPtr ppix)
+@@ -495,11 +499,15 @@ nouveau_pixmap_offset(PixmapPtr ppix)
{
ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
NVPtr pNv = NVPTR(pScrn);
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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nouveau-multiple-xserver.patch 14 May 2009 12:53:09 -0000 1.8
+++ nouveau-multiple-xserver.patch 18 May 2009 09:33:16 -0000 1.9
@@ -1,7 +1,7 @@
From 35e118a76737a196b7dfe0a63683fe94a4b1661e 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/7] f11: hack to support multiple xserver instances
+Subject: [PATCH 3/8] f11: hack to support multiple xserver instances
---
src/nv_driver.c | 126 ++++++++++++++++++++++++++++++++++++++++++------------
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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nouveau-nv50-fb-accel.patch 14 May 2009 12:53:09 -0000 1.8
+++ nouveau-nv50-fb-accel.patch 18 May 2009 09:33:16 -0000 1.9
@@ -1,7 +1,7 @@
From 3a9b44986234c62e11dc225e4e5ae05e1487c79c 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/7] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout
+Subject: [PATCH 4/8] nv50/f11: accelerate front-buffer rendering, linear shadow for scanout
---
src/Makefile.am | 1 +
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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nouveau-nv50-nva0-noaccel.patch 14 May 2009 12:53:09 -0000 1.8
+++ nouveau-nv50-nva0-noaccel.patch 18 May 2009 09:33:16 -0000 1.9
@@ -1,7 +1,7 @@
From 36f1dc154cbcc9f6f247f2fd6de8706802f82194 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/7] nv50/f11: disable acceleration on NVAx chipsets
+Subject: [PATCH 5/8] nv50/f11: disable acceleration on NVAx chipsets
---
src/nv_driver.c | 8 ++++++++
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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nouveau-store-vbios.patch 14 May 2009 12:53:09 -0000 1.8
+++ nouveau-store-vbios.patch 18 May 2009 09:33:16 -0000 1.9
@@ -1,7 +1,7 @@
From 3f4763af5a48077e2b98888ab8d3383933128697 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/7] bios/f11: store a copy of used vbios image in /var/run
+Subject: [PATCH 2/8] bios/f11: store a copy of used vbios image in /var/run
---
src/nv_bios.c | 13 +++++++++++++
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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nouveau-transition-hack.patch 14 May 2009 12:53:09 -0000 1.8
+++ nouveau-transition-hack.patch 18 May 2009 09:33:16 -0000 1.9
@@ -1,7 +1,7 @@
From 14ab3035714b46221c57339ec760f373dab8cc7a 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/7] kms/f11: hack in transition support without driver pixmaps
+Subject: [PATCH 1/8] kms/f11: hack in transition support without driver pixmaps
---
src/drmmode_display.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++-
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.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- xorg-x11-drv-nouveau.spec 14 May 2009 12:53:09 -0000 1.48
+++ xorg-x11-drv-nouveau.spec 18 May 2009 09:33:16 -0000 1.49
@@ -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: 36.%{snapshot}%{?dist}
+Release: 37.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/nouveau.4*
%changelog
+* Thu May 18 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-37.20090514git9656762
+- <nv50: fix randr rotation
+
* Thu May 14 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-36.20090514git9656762
- nv50: fix hang with multiple displays when encoders swap crtcs
- Previous message (by thread): rpms/trackballs-music/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 trackballs-music.spec, 1.4, 1.5
- Next message (by thread): rpms/libgphoto2/devel .cvsignore, 1.8, 1.9 libgphoto2.spec, 1.20, 1.21 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list