rpms/xorg-x11-drv-nouveau/F-11 nouveau-fb-resize.patch, 1.2, 1.3 xorg-x11-drv-nouveau.spec, 1.42, 1.43
Ben Skeggs
bskeggs at fedoraproject.org
Tue Apr 21 05:10:02 UTC 2009
- Previous message: rpms/man/devel man.spec,1.79,1.80
- Next message: rpms/sagator/F-11 .cvsignore, 1.7, 1.8 import.log, 1.5, 1.6 sagator.spec, 1.8, 1.9 sources, 1.7, 1.8
- 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-serv28267
Modified Files:
nouveau-fb-resize.patch xorg-x11-drv-nouveau.spec
Log Message:
* Mon Apr 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-31.20090421git47bb00f
- fix for rh#496559
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nouveau-fb-resize.patch 20 Apr 2009 23:06:47 -0000 1.2
+++ nouveau-fb-resize.patch 21 Apr 2009 05:10:01 -0000 1.3
@@ -1,16 +1,16 @@
-From 338c31fa8624b401a5f98724c498367351ce4acf Mon Sep 17 00:00:00 2001
+From 7e4b7775589cff4433de1f3dfa1416c66cdfe060 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/6] f11: support framebuffer resize without driver pixmaps
---
src/drmmode_display.c | 75 +++++++++++++++++++++++++++++++--
- src/nouveau_exa.c | 8 ++-
+ src/nouveau_exa.c | 17 ++++----
src/nv50_randr.c | 6 +++
src/nv_crtc.c | 16 ++++++-
src/nv_driver.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++---
src/nv_type.h | 9 ++++-
- 6 files changed, 205 insertions(+), 17 deletions(-)
+ 6 files changed, 209 insertions(+), 22 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index ca1a60b..c666c9f 100644
@@ -122,7 +122,7 @@
}
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
-index aee2794..6da7d36 100644
+index aee2794..41e3f85 100644
--- a/src/nouveau_exa.c
+++ b/src/nouveau_exa.c
@@ -279,7 +279,10 @@ nouveau_exa_prepare_access(PixmapPtr ppix, int index)
@@ -137,7 +137,17 @@
} else {
/* force migration */
return FALSE;
-@@ -543,10 +546,9 @@ Bool
+@@ -301,7 +304,8 @@ nouveau_exa_finish_access(PixmapPtr ppix, int index)
+ if (ppix == pScreen->GetScreenPixmap(pScreen)) {
+ ppix->devPrivate.ptr = NULL;
+ nouveau_bo_unmap(pNv->scanout);
+- nv50_shadow_damage_frontbuffer_fallback(pScrn);
++ if (pNv->Architecture == NV_ARCH_50)
++ nv50_shadow_damage_frontbuffer_fallback(pScrn);
+ }
+ }
+
+@@ -543,10 +547,9 @@ Bool
nouveau_exa_pixmap_is_onscreen(PixmapPtr ppix)
{
ScrnInfoPtr pScrn = xf86Screens[ppix->drawable.pScreen->myNum];
@@ -149,6 +159,19 @@
return TRUE;
return FALSE;
+@@ -630,10 +633,8 @@ nouveau_exa_init(ScreenPtr pScreen)
+ }
+
+ /* Needed for frontbuffer fallbacks (to ensure it accesses the linear fb). */
+- if (pNv->Architecture >= NV_ARCH_50) {
+- exa->PrepareAccess = nouveau_exa_prepare_access;
+- exa->FinishAccess = nouveau_exa_finish_access;
+- }
++ exa->PrepareAccess = nouveau_exa_prepare_access;
++ exa->FinishAccess = nouveau_exa_finish_access;
+
+ 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 538c883..c451ba3 100644
--- a/src/nv50_randr.c
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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xorg-x11-drv-nouveau.spec 20 Apr 2009 23:06:47 -0000 1.42
+++ xorg-x11-drv-nouveau.spec 21 Apr 2009 05:10:01 -0000 1.43
@@ -19,7 +19,7 @@
# need to set an epoch to get version number in sync with upstream
Epoch: 1
Version: %{nouveau_version}
-Release: 30.%{snapshot}%{?dist}
+Release: 31.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -85,7 +85,10 @@
%{_mandir}/man4/nouveau.4*
%changelog
-* Mon Apr 20 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-30.20090421git47bb00f
+* Mon Apr 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-31.20090421git47bb00f
+- fix for rh#496559
+
+* Mon Apr 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-30.20090421git47bb00f
- fix for rh#489101
* Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-29.20090417gitfa2f111
- Previous message: rpms/man/devel man.spec,1.79,1.80
- Next message: rpms/sagator/F-11 .cvsignore, 1.7, 1.8 import.log, 1.5, 1.6 sagator.spec, 1.8, 1.9 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list