diff --git a/.gitignore b/.gitignore index 43f529f..f9c26ad 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ xf86-video-ati-20100705.tar.xz /xf86-video-ati-7.1.0.tar.bz2 /xf86-video-ati-20130408.tar.xz /xf86-video-ati-7.2.0.tar.bz2 +/xf86-video-ati-20131101.tar.xz diff --git a/glamor-fix-rendering.patch b/glamor-fix-rendering.patch deleted file mode 100644 index 03ea265..0000000 --- a/glamor-fix-rendering.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 0c921edf0162fed616cea9d02e168b719243bcd2 Mon Sep 17 00:00:00 2001 -From: Jerome Glisse -Date: Wed, 30 Oct 2013 13:01:02 -0400 -Subject: [PATCH] radeon/glamor: with new pixmap for dri2 drawable no need to - create new texture - -When creating a new pixmap/bo for dri2 drawable there is no need to create a -new texture, instead the texture associated with the new pixmap should be use -otherwise there is a missmatch between the bo backing the texture for the -drawable and the bo used by dri2 client. - -Signed-off-by: Jerome Glisse -Reviewed-by: Alex Deucher ---- - configure.ac | 2 +- - src/radeon_dri2.c | 17 ++++++----------- - 2 files changed, 7 insertions(+), 12 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0fe0991..835b7b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -107,7 +107,7 @@ AC_ARG_ENABLE(glamor, - AC_MSG_RESULT([$GLAMOR]) - AM_CONDITIONAL(GLAMOR, test x$GLAMOR != xno) - if test "x$GLAMOR" != "xno"; then -- PKG_CHECK_MODULES(LIBGLAMOR, [glamor >= 0.5.1]) -+ PKG_CHECK_MODULES(LIBGLAMOR, [glamor >= 0.5.0]) - PKG_CHECK_MODULES(LIBGLAMOR_EGL, [glamor-egl]) - AC_DEFINE(USE_GLAMOR, 1, [Enable glamor acceleration]) - fi -diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c -index a211960..79d8f39 100644 ---- a/src/radeon_dri2.c -+++ b/src/radeon_dri2.c -@@ -66,6 +66,10 @@ - - #define FALLBACK_SWAP_DELAY 16 - -+#ifdef USE_GLAMOR -+#include -+#endif -+ - typedef DRI2BufferPtr BufferPtr; - - struct dri2_buffer_priv { -@@ -89,7 +93,6 @@ static PixmapPtr fixup_glamor(DrawablePtr drawable, PixmapPtr pixmap) - PixmapPtr old = get_drawable_pixmap(drawable); - #ifdef USE_GLAMOR - ScreenPtr screen = drawable->pScreen; -- ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - struct radeon_pixmap *priv = radeon_get_pixmap_private(pixmap); - GCPtr gc; - -@@ -118,21 +121,13 @@ static PixmapPtr fixup_glamor(DrawablePtr drawable, PixmapPtr pixmap) - } - - radeon_set_pixmap_private(pixmap, NULL); -- screen->DestroyPixmap(pixmap); - - /* And redirect the pixmap to the new bo (for 3D). */ -+ glamor_egl_exchange_buffers(old, pixmap); - radeon_set_pixmap_private(old, priv); -+ screen->DestroyPixmap(pixmap); - old->refcnt++; - -- /* This creating should not fail, as we already created its -- * successfully. But if it happens, we put a warning indicator -- * here, and the old pixmap will still be a glamor pixmap, and -- * latter the pixmap_flink will get a 0 name, then the X server -- * will pass a BadAlloc to the client.*/ -- if (!radeon_glamor_create_textured_pixmap(old)) -- xf86DrvMsg(scrn->scrnIndex, X_WARNING, -- "Failed to get DRI drawable for glamor pixmap.\n"); -- - screen->ModifyPixmapHeader(old, - old->drawable.width, - old->drawable.height, --- -1.8.3.1 - diff --git a/sources b/sources index 2b1edcd..a59b7b8 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 5ab9a826699e5c86ef89fca43ebb3821 xf86-video-ati-7.2.0.tar.bz2 +731ded79c09939c1722547a199fab4a2 xf86-video-ati-20131101.tar.xz diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec index c4fe326..d61fc64 100644 --- a/xorg-x11-drv-ati.spec +++ b/xorg-x11-drv-ati.spec @@ -1,8 +1,8 @@ %define tarball xf86-video-ati %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -#define gitdate 20130408 -#define gitversion 6e74aacc5 +%define gitdate 20131101 +%define gitversion 3b38701 %if 0%{?gitdate} %define gver .%{gitdate}git%{gitversion} @@ -11,17 +11,16 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 7.2.0 -Release: 2%{?gver}%{?dist} +Release: 3%{?gver}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support -Source0: http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 -#Source0: %{tarball}-%{gitdate}.tar.xz +#Source0: http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +Source0: %{tarball}-%{gitdate}.tar.xz Patch10: radeon-6.12.2-lvds-default-modes.patch Patch13: fix-default-modes.patch -Patch14: glamor-fix-rendering.patch ExcludeArch: s390 s390x @@ -46,7 +45,6 @@ X.Org X11 ati video driver. %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}} %patch10 -p1 -b .lvds %patch13 -p1 -b .def -%patch14 -p1 -b .glamor %build autoreconf -iv @@ -74,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/radeon.4* %changelog +* Fri Nov 01 2013 Jerome Glisse - 7.2.0-3 +- Update to lastest upstream git snapshot + * Fri Oct 25 2013 Jerome Glisse - 7.2.0-2 - Fix gnome-shell rendering issue with radeonsi