rpms/xorg-x11-drv-nouveau/F-11 nouveau-bicubic-2x.patch, 1.6, 1.7 nouveau-fb-resize.patch, 1.10, 1.11 nouveau-multiple-xserver.patch, 1.10, 1.11 nouveau-nv50-fb-accel.patch, 1.10, 1.11 nouveau-nv50-nva0-noaccel.patch, 1.10, 1.11 nouveau-store-vbios.patch, 1.10, 1.11 nouveau-transition-hack.patch, 1.10, 1.11 xorg-x11-drv-nouveau.spec, 1.50, 1.51
Ben Skeggs
bskeggs at fedoraproject.org
Wed Jun 17 12:09:25 UTC 2009
- Previous message (by thread): rpms/perl-IPC-Run3/F-10 .cvsignore, 1.6, 1.7 perl-IPC-Run3.spec, 1.15, 1.16 sources, 1.6, 1.7
- Next message (by thread): rpms/xorg-x11-drv-nouveau/F-11 nv50-pramin-vbios.patch, NONE, 1.1 nouveau-fptable-noerror.patch, 1.1, NONE
- 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-serv10773
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:
* Tue Jun 16 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-39.20090528git0c17b87
- minor fixes from upstream
- nv50-pramin-vbios.patch: rh#492658
- nouveau-fptable-noerror.patch: drop patch, is upstream
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.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nouveau-bicubic-2x.patch 24 May 2009 22:50:17 -0000 1.6
+++ nouveau-bicubic-2x.patch 17 Jun 2009 12:09:24 -0000 1.7
@@ -1,4 +1,4 @@
-From ca31642a21dd13ed159a062ae894246a42d033f2 Mon Sep 17 00:00:00 2001
+From 71b13de8510b9c58821d0a5c296aad5bcb3b6ea1 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
@@ -9,10 +9,10 @@ Subject: [PATCH 7/8] xv: only use bicubi
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/nv30_xv_tex.c b/src/nv30_xv_tex.c
-index 32a001c..3414c37 100644
+index 96796fa..adb9010 100644
--- a/src/nv30_xv_tex.c
+++ b/src/nv30_xv_tex.c
-@@ -322,7 +322,7 @@ NV30PutTextureImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset,
+@@ -324,7 +324,7 @@ NV30PutTextureImage(ScrnInfoPtr pScrn, struct nouveau_bo *src, int src_offset,
BEGIN_RING(chan, rankine, NV34TCL_TX_ENABLE(3), 1);
OUT_RING (chan, 0x0);
@@ -22,10 +22,10 @@ index 32a001c..3414c37 100644
else
NV30_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
diff --git a/src/nv40_xv_tex.c b/src/nv40_xv_tex.c
-index c7bbd4e..f69b26e 100644
+index 46a7c3d..417dfb7 100644
--- a/src/nv40_xv_tex.c
+++ b/src/nv40_xv_tex.c
-@@ -298,7 +298,7 @@ NV40PutTextureImage(ScrnInfoPtr pScrn,
+@@ -300,7 +300,7 @@ NV40PutTextureImage(ScrnInfoPtr pScrn,
NV40VideoTexture(pScrn, src, src_offset2, src_w/2, src_h/2, src_pitch, 2);
NV40_LoadVtxProg(pScrn, &nv40_vp_video);
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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nouveau-fb-resize.patch 24 May 2009 22:50:17 -0000 1.10
+++ nouveau-fb-resize.patch 17 Jun 2009 12:09:24 -0000 1.11
@@ -1,4 +1,4 @@
-From b54aeab191625d82e38a3170bb4061255f502ff8 Mon Sep 17 00:00:00 2001
+From 9210a9e26271bab7a77ff1346383b9732a33f43b 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,7 +13,7 @@ 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 aef4886..7527fe1 100644
+index deed5d6..e987a85 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1071,6 +1071,59 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
@@ -122,7 +122,7 @@ index aef4886..7527fe1 100644
}
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
-index cf050f9..cae3a3f 100644
+index 437ded5..190be7b 100644
--- a/src/nouveau_exa.c
+++ b/src/nouveau_exa.c
@@ -279,7 +279,10 @@ nouveau_exa_prepare_access(PixmapPtr ppix, int index)
@@ -184,7 +184,7 @@ index cf050f9..cae3a3f 100644
exa->MarkSync = nouveau_exa_mark_sync;
exa->WaitMarker = nouveau_exa_wait_marker;
diff --git a/src/nv50_randr.c b/src/nv50_randr.c
-index e66b24a..4c770ee 100644
+index e006b38..64c6794 100644
--- a/src/nv50_randr.c
+++ b/src/nv50_randr.c
@@ -308,8 +308,19 @@ nv50_crtc_set_origin(xf86CrtcPtr crtc, int x, int y)
@@ -209,10 +209,10 @@ index e66b24a..4c770ee 100644
NV50DisplayCommand(pScrn, NV50_UPDATE_DISPLAY, 0);
}
diff --git a/src/nv_crtc.c b/src/nv_crtc.c
-index 83d5e40..01462c2 100644
+index 2cdef8c..1983943 100644
--- a/src/nv_crtc.c
+++ b/src/nv_crtc.c
-@@ -952,7 +952,7 @@ nv_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
+@@ -954,7 +954,7 @@ nv_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
unsigned long rotate_pitch;
int size, align = 64;
@@ -221,7 +221,7 @@ index 83d5e40..01462c2 100644
size = rotate_pitch * height;
assert(nv_crtc->shadow == NULL);
-@@ -985,6 +985,7 @@ nv_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
+@@ -987,6 +987,7 @@ nv_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
offset = pNv->FBMap + nv_crtc->shadow->offset;
#endif /* NOUVEAU_EXA_PIXMAPS */
@@ -229,7 +229,7 @@ index 83d5e40..01462c2 100644
return offset;
}
-@@ -995,11 +996,10 @@ static PixmapPtr
+@@ -997,11 +998,10 @@ static PixmapPtr
nv_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
{
ScrnInfoPtr pScrn = crtc->scrn;
@@ -242,7 +242,7 @@ index 83d5e40..01462c2 100644
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)
+@@ -1010,8 +1010,6 @@ nv_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
if (!data)
data = crtc->funcs->shadow_allocate (crtc, width, height);
@@ -251,7 +251,7 @@ index 83d5e40..01462c2 100644
#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)
+@@ -1028,7 +1026,7 @@ nv_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
width, height,
pScrn->depth,
pScrn->bitsPerPixel,
@@ -260,7 +260,7 @@ index 83d5e40..01462c2 100644
data);
#endif /* NOUVEAU_EXA_PIXMAPS */
-@@ -1050,7 +1048,7 @@ nv_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
+@@ -1052,7 +1050,7 @@ nv_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
height,
pScrn->depth,
pScrn->bitsPerPixel,
@@ -269,9 +269,9 @@ index 83d5e40..01462c2 100644
data);
nvpix = exaGetPixmapDriverPrivate(rotate_pixmap);
-@@ -1153,16 +1151,29 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
+@@ -1155,16 +1153,29 @@ void NVCrtcSetBase(xf86CrtcPtr crtc, int x, int y)
ScrnInfoPtr pScrn = crtc->scrn;
- NVPtr pNv = NVPTR(pScrn);
+ NVPtr pNv = NVPTR(pScrn);
struct nouveau_crtc *nv_crtc = to_nouveau_crtc(crtc);
- uint32_t start = (y * pScrn->displayWidth + x) * pScrn->bitsPerPixel / 8;
+ uint32_t cpp = pScrn->bitsPerPixel / 8;
@@ -303,10 +303,10 @@ index 83d5e40..01462c2 100644
start &= ~3;
pNv->ModeReg.crtc_reg[nv_crtc->head].fb_start = start;
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 52fe1e2..e91bb15 100644
+index 5cc44d8..64632c1 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
-@@ -903,16 +903,112 @@ Bool NVI2CInit(ScrnInfoPtr pScrn)
+@@ -775,16 +775,112 @@ Bool NVI2CInit(ScrnInfoPtr pScrn)
return TRUE;
}
@@ -424,7 +424,7 @@ index 52fe1e2..e91bb15 100644
}
static const xf86CrtcConfigFuncsRec nv_xf86crtc_config_funcs = {
-@@ -1426,7 +1522,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1295,7 +1391,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
} else
nv50_output_create(pScrn); /* create randr-1.2 "outputs". */
@@ -434,18 +434,18 @@ index 52fe1e2..e91bb15 100644
}
diff --git a/src/nv_type.h b/src/nv_type.h
-index b79474e..97d6912 100644
+index b96d8cb..c448bff 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
-@@ -212,6 +212,7 @@ struct nouveau_crtc {
- int head;
- uint8_t last_dpms;
+@@ -217,6 +217,7 @@ struct nouveau_crtc {
+
+ uint32_t cursor_fg, cursor_bg;
ExaOffscreenArea *shadow;
+ unsigned shadow_pitch;
- int fp_users;
- uint32_t dpms_saved_fp_control;
- int saturation, sharpness;
-@@ -305,8 +306,11 @@ typedef struct _NVRec {
+ };
+
+ struct nouveau_encoder {
+@@ -307,8 +308,11 @@ typedef struct _NVRec {
volatile CARD8 *PDIO1;
uint8_t cur_head;
@@ -457,7 +457,7 @@ index b79474e..97d6912 100644
ScreenBlockHandlerProcPtr BlockHandler;
CloseScreenProcPtr CloseScreen;
/* Cursor */
-@@ -495,11 +499,15 @@ nouveau_pixmap_offset(PixmapPtr ppix)
+@@ -496,11 +500,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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nouveau-multiple-xserver.patch 24 May 2009 22:50:17 -0000 1.10
+++ nouveau-multiple-xserver.patch 17 Jun 2009 12:09:24 -0000 1.11
@@ -1,14 +1,14 @@
-From 366acdddcc07a86f600cbf062f4454bf7a185bc3 Mon Sep 17 00:00:00 2001
+From d501dc111d23e1f65f58b4f23ca55506343ca8a0 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
---
- src/nv_driver.c | 126 ++++++++++++++++++++++++++++++++++++++++++------------
- 1 files changed, 98 insertions(+), 28 deletions(-)
+ src/nv_driver.c | 127 ++++++++++++++++++++++++++++++++++++++++++-------------
+ 1 files changed, 98 insertions(+), 29 deletions(-)
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 2b3a596..696fa6d 100644
+index 36ac7e5..f7cfd3e 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -21,6 +21,7 @@
@@ -19,7 +19,7 @@ index 2b3a596..696fa6d 100644
#include "nv_include.h"
-@@ -657,14 +658,27 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
+@@ -532,14 +533,27 @@ NV50ReleaseDisplay(ScrnInfoPtr pScrn)
*/
/* Mandatory */
@@ -47,7 +47,7 @@ index 2b3a596..696fa6d 100644
if (!pNv->NoAccel)
NVAccelCommonInit(pScrn);
-@@ -721,6 +735,12 @@ NVLeaveVT(int scrnIndex, int flags)
+@@ -596,6 +610,12 @@ NVLeaveVT(int scrnIndex, int flags)
NVSync(pScrn);
@@ -60,7 +60,7 @@ index 2b3a596..696fa6d 100644
if (!pNv->kms_enable) {
if (pNv->Architecture < NV_ARCH_50)
NVRestore(pScrn);
-@@ -1632,11 +1652,81 @@ NVMapMemSW(ScrnInfoPtr pScrn)
+@@ -1497,11 +1517,81 @@ NVMapMemSW(ScrnInfoPtr pScrn)
}
static Bool
@@ -125,8 +125,8 @@ index 2b3a596..696fa6d 100644
+ size >> 10);
+ }
+
-+ if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_GART | NOUVEAU_BO_PIN, 0,
-+ size, &pNv->GART)) {
++ if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_GART | NOUVEAU_BO_PIN |
++ NOUVEAU_BO_MAP, 0, size, &pNv->GART)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Unable to allocate GART memory\n");
+ }
@@ -142,7 +142,7 @@ index 2b3a596..696fa6d 100644
if (!pNv->dev)
return NVMapMemSW(pScrn);
-@@ -1653,46 +1743,26 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1518,47 +1608,26 @@ NVMapMem(ScrnInfoPtr pScrn)
size = size * (pScrn->bitsPerPixel >> 3);
size = size * pScrn->virtualY;
} else {
@@ -151,9 +151,9 @@ index 2b3a596..696fa6d 100644
size = pNv->VRAMPhysicalSize / 2;
}
-- if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
-- 0, size, &pNv->FB)) {
-+ flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN;
+- if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN |
+- NOUVEAU_BO_MAP, 0, size, &pNv->FB)) {
++ flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN | NOUVEAU_BO_MAP;
+ if (pNv->Architecture >= NV_ARCH_50)
+ flags |= NOUVEAU_BO_TILED;
+
@@ -184,8 +184,8 @@ index 2b3a596..696fa6d 100644
- size >> 10);
- }
-
-- if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_GART | NOUVEAU_BO_PIN, 0,
-- size, &pNv->GART)) {
+- if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_GART | NOUVEAU_BO_PIN |
+- NOUVEAU_BO_MAP, 0, size, &pNv->GART)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Unable to allocate GART memory\n");
- }
@@ -194,9 +194,10 @@ index 2b3a596..696fa6d 100644
- "GART: Allocated %dMiB as a scratch buffer\n",
- (unsigned int)(pNv->GART->size >> 20));
- }
-
+-
/* We don't need to allocate cursors / lut here if we're using
* kernel modesetting
+ **/
--
1.6.2.2
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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nouveau-nv50-fb-accel.patch 24 May 2009 22:50:18 -0000 1.10
+++ nouveau-nv50-fb-accel.patch 17 Jun 2009 12:09:24 -0000 1.11
@@ -1,4 +1,4 @@
-From ba3136309190c4733f33e5d4ec03726e1d8c0404 Mon Sep 17 00:00:00 2001
+From a858619710e3eb53f188fb8e5eb53d256bde119f 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
@@ -10,11 +10,11 @@ Subject: [PATCH 4/8] nv50/f11: accelerat
src/nv50_randr.c | 2 +-
src/nv50_shadow_damage.c | 306 ++++++++++++++++++++++++++++++++++++++++++++++
src/nv_dri.c | 2 +-
- src/nv_driver.c | 38 +++++-
+ src/nv_driver.c | 40 ++++++-
src/nv_proto.h | 4 +
src/nv_shadow.c | 8 +-
src/nv_type.h | 4 +
- 10 files changed, 387 insertions(+), 23 deletions(-)
+ 10 files changed, 389 insertions(+), 23 deletions(-)
create mode 100644 src/nv50_shadow_damage.c
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -30,7 +30,7 @@ index 29253a6..0c9e4e9 100644
nouveau_output.h \
nouveau_connector.h \
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 5f6621a..aef4886 100644
+index b05771a..deed5d6 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -216,8 +216,8 @@ drmmode_fb_copy_sw(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id,
@@ -63,7 +63,7 @@ index 5f6621a..aef4886 100644
ErrorF("failed to add fb\n");
return FALSE;
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
-index 949f747..cf050f9 100644
+index 6d1c72e..437ded5 100644
--- a/src/nouveau_exa.c
+++ b/src/nouveau_exa.c
@@ -265,7 +265,8 @@ nouveau_exa_wait_marker(ScreenPtr pScreen, int marker)
@@ -156,7 +156,7 @@ index 949f747..cf050f9 100644
exa->WaitMarker = nouveau_exa_wait_marker;
diff --git a/src/nv50_randr.c b/src/nv50_randr.c
-index a261a3b..e66b24a 100644
+index 7a88f24..e006b38 100644
--- a/src/nv50_randr.c
+++ b/src/nv50_randr.c
@@ -117,7 +117,7 @@ nv50_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, DisplayModePtr adjuste
@@ -481,10 +481,10 @@ index 0000000..790b09c
+ return true;
+}
diff --git a/src/nv_dri.c b/src/nv_dri.c
-index bd3e5a9..dca6a40 100644
+index f1fe501..68284d2 100644
--- a/src/nv_dri.c
+++ b/src/nv_dri.c
-@@ -337,7 +337,7 @@ Bool NVDRIFinishScreenInit(ScrnInfoPtr pScrn)
+@@ -335,7 +335,7 @@ Bool NVDRIFinishScreenInit(ScrnInfoPtr pScrn)
pNOUVEAUDRI->depth = pScrn->depth;
pNOUVEAUDRI->bpp = pScrn->bitsPerPixel;
@@ -494,10 +494,10 @@ index bd3e5a9..dca6a40 100644
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"[dri] unable to reference front buffer: %d\n", ret);
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 696fa6d..9e0af49 100644
+index f7cfd3e..35cdd83 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
-@@ -689,10 +689,11 @@ NVEnterVT(int scrnIndex, int flags)
+@@ -564,10 +564,11 @@ NVEnterVT(int scrnIndex, int flags)
/* Clear the framebuffer, we don't want to see garbage
* on-screen up until X decides to draw something
*/
@@ -513,7 +513,7 @@ index 696fa6d..9e0af49 100644
if (pNv->Architecture == NV_ARCH_50) {
if (!NV50AcquireDisplay(pScrn))
-@@ -1612,6 +1613,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
+@@ -1477,6 +1478,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
return FALSE;
pNv->GART = NULL;
@@ -522,7 +522,7 @@ index 696fa6d..9e0af49 100644
ret = nouveau_bo_fake(&dev, Cursor0Offset,
NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
64 * 64 * 4, pNv->VRAMMap + Cursor0Offset,
-@@ -1763,6 +1766,23 @@ skip_fb:
+@@ -1628,6 +1631,25 @@ skip_fb:
"at offset 0x%X\n",
(uint32_t)(pNv->FB->size >> 20), (uint32_t) pNv->FB->offset);
@@ -534,8 +534,9 @@ index 696fa6d..9e0af49 100644
+ scanout_size *= (pScrn->bitsPerPixel >> 3);
+ scanout_size *= pScrn->virtualY;
+
-+ if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
-+ 0, scanout_size, &pNv->scanout)) {
++ if (nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN |
++ NOUVEAU_BO_MAP, 0, scanout_size,
++ &pNv->scanout)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Failed to allocate scanout buffer\n");
+ return FALSE;
@@ -543,10 +544,11 @@ index 696fa6d..9e0af49 100644
+ } else {
+ nouveau_bo_ref(pNv->FB, &pNv->scanout);
+ }
-
++
/* We don't need to allocate cursors / lut here if we're using
* kernel modesetting
-@@ -1835,6 +1855,7 @@ NVUnmapMem(ScrnInfoPtr pScrn)
+ **/
+@@ -1700,6 +1722,7 @@ NVUnmapMem(ScrnInfoPtr pScrn)
}
nouveau_bo_ref(NULL, &pNv->FB);
@@ -554,7 +556,7 @@ index 696fa6d..9e0af49 100644
nouveau_bo_ref(NULL, &pNv->GART);
nouveau_bo_ref(NULL, &pNv->Cursor);
nouveau_bo_ref(NULL, &pNv->Cursor2);
-@@ -2351,6 +2372,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
+@@ -2216,6 +2239,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
bool on = xf86IsUnblank(mode);
int i;
@@ -571,7 +573,7 @@ index 696fa6d..9e0af49 100644
return vgaHWSaveScreen(pScreen, mode);
diff --git a/src/nv_proto.h b/src/nv_proto.h
-index 614fa72..4e07aae 100644
+index 8a1a269..580233b 100644
--- a/src/nv_proto.h
+++ b/src/nv_proto.h
@@ -267,6 +267,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool);
@@ -618,10 +620,10 @@ index ea1ba35..e15051c 100644
+ nouveau_bo_unmap(pNv->scanout);
}
diff --git a/src/nv_type.h b/src/nv_type.h
-index 482b5a6..b79474e 100644
+index 8af599a..b96d8cb 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
-@@ -271,6 +271,7 @@ typedef struct _NVRec {
+@@ -273,6 +273,7 @@ typedef struct _NVRec {
/* Various pinned memory regions */
struct nouveau_bo * FB;
void * FBMap;
@@ -629,7 +631,7 @@ index 482b5a6..b79474e 100644
//struct nouveau_bo * FB_old; /* for KMS */
struct nouveau_bo * shadow[2]; /* for easy acces by exa */
struct nouveau_bo * Cursor;
-@@ -279,6 +280,9 @@ typedef struct _NVRec {
+@@ -281,6 +282,9 @@ typedef struct _NVRec {
struct nvbios VBIOS;
struct nouveau_bios_info *vbios;
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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nouveau-nv50-nva0-noaccel.patch 24 May 2009 22:50:18 -0000 1.10
+++ nouveau-nv50-nva0-noaccel.patch 17 Jun 2009 12:09:24 -0000 1.11
@@ -1,4 +1,4 @@
-From 894c67504a51d539406ac61f4d614c7a6ba736de Mon Sep 17 00:00:00 2001
+From 3a8b37213c2add655b3b224989367dbbc8b638ed 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
@@ -8,10 +8,10 @@ Subject: [PATCH 5/8] nv50/f11: disable a
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 9e0af49..52fe1e2 100644
+index 35cdd83..5cc44d8 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
-@@ -1147,6 +1147,14 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1018,6 +1018,14 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
pNv->ShadowFB = TRUE;
}
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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nouveau-store-vbios.patch 24 May 2009 22:50:18 -0000 1.10
+++ nouveau-store-vbios.patch 17 Jun 2009 12:09:24 -0000 1.11
@@ -1,4 +1,4 @@
-From 8338704baa0988a8a144feab1e62e8c9126bb468 Mon Sep 17 00:00:00 2001
+From 399e2942565702db044741e1b749105675d060fc 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
@@ -8,7 +8,7 @@ Subject: [PATCH 2/8] bios/f11: store a c
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/nv_bios.c b/src/nv_bios.c
-index f34f86a..422da28 100644
+index 182456a..ffd6b1f 100644
--- a/src/nv_bios.c
+++ b/src/nv_bios.c
@@ -22,6 +22,9 @@
@@ -21,7 +21,7 @@ index f34f86a..422da28 100644
#include "nv_include.h"
#if defined(__FreeBSD__) || defined(__NetBSD__)
-@@ -4680,7 +4683,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
+@@ -4672,7 +4675,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
bool NVInitVBIOS(ScrnInfoPtr pScrn)
{
@@ -32,7 +32,7 @@ index f34f86a..422da28 100644
memset(bios, 0, sizeof(struct nvbios));
-@@ -4691,6 +4697,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+@@ -4683,6 +4689,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
if (bios->length > NV_PROM_SIZE)
bios->length = NV_PROM_SIZE;
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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nouveau-transition-hack.patch 24 May 2009 22:50:18 -0000 1.10
+++ nouveau-transition-hack.patch 17 Jun 2009 12:09:24 -0000 1.11
@@ -1,4 +1,4 @@
-From bc699591adee16317aa494b30fbed9d38c1a5f71 Mon Sep 17 00:00:00 2001
+From 78ae88d3b353b9a65aae8494a70d455b20a1304a 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,7 +8,7 @@ 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 dbc4bf1..5f6621a 100644
+index 77b9015..b05771a 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -187,6 +187,139 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
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.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- xorg-x11-drv-nouveau.spec 24 May 2009 22:50:18 -0000 1.50
+++ xorg-x11-drv-nouveau.spec 17 Jun 2009 12:09:24 -0000 1.51
@@ -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 20090525
-%define git_version db9ff95
+%define gitdate 20090528
+%define git_version 0c17b87
%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: 38.%{snapshot}%{?dist}
+Release: 39.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -49,7 +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
+Patch8: nv50-pramin-vbios.patch
%description
X.Org X11 nouveau video driver.
@@ -65,7 +65,7 @@ X.Org X11 nouveau video driver.
%patch5 -p1 -b .dcbconf
%patch6 -p1 -b .fbresize
%patch7 -p1 -b .bicubic
-%patch8 -p1 -b .fpmode
+%patch8 -p1 -b .pramin_bios
%build
autoreconf -v --install
@@ -89,6 +89,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/nouveau.4*
%changelog
+* Tue Jun 16 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-39.20090528git0c17b87
+- minor fixes from upstream
+- nv50-pramin-vbios.patch: rh#492658
+- nouveau-fptable-noerror.patch: drop patch, is upstream
+
* 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
- Previous message (by thread): rpms/perl-IPC-Run3/F-10 .cvsignore, 1.6, 1.7 perl-IPC-Run3.spec, 1.15, 1.16 sources, 1.6, 1.7
- Next message (by thread): rpms/xorg-x11-drv-nouveau/F-11 nv50-pramin-vbios.patch, NONE, 1.1 nouveau-fptable-noerror.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list