[xorg-x11-drv-ati] Enable glamor acceleration for southern island GPU

[Jerome Glisse]

commit 6f82c65fa111f3992469aec2b1238a2beda51ced
Author: Jerome Glisse <jglisse at redhat.com>
Date:   Wed Apr 10 09:45:34 2013 -0400

    Enable glamor acceleration for southern island GPU

 radeonsi-glamor-on-by-default.patch |   15 +++++++++++++++
 xorg-x11-drv-ati.spec               |   19 +++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)
---
diff --git a/radeonsi-glamor-on-by-default.patch b/radeonsi-glamor-on-by-default.patch
new file mode 100644
index 0000000..0b534d0
--- /dev/null
+++ b/radeonsi-glamor-on-by-default.patch
@@ -0,0 +1,15 @@
+diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
+index 488593e..734aefd 100644
+--- a/src/radeon_glamor.c
++++ b/src/radeon_glamor.c
+@@ -86,10 +86,6 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
+ 	if (!info->dri2.available)
+ 		return FALSE;
+ 
+-	s = xf86GetOptValString(info->Options, OPTION_ACCELMETHOD);
+-	if (s == NULL && info->ChipFamily < CHIP_FAMILY_TAHITI)
+-		return FALSE;
+-
+ 	if (s && strcasecmp(s, "glamor") != 0)
+ 		return FALSE;
+ 
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index f6afbd2..77f083f 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 20121015
-#define gitversion bd9e2c064
+%define gitdate 20130408
+%define gitversion 6e74aacc5
 
 %if 0%{?gitdate}
 %define gver .%{gitdate}git%{gitversion}
@@ -11,16 +11,17 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   7.1.0
-Release:   3%{?gver}%{?dist}
+Release:   4%{?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:    radeonsi-glamor-on-by-default.patch
 
 ExcludeArch: s390 s390x
 
@@ -32,6 +33,7 @@ BuildRequires: kernel-headers >= 2.6.27-0.308
 BuildRequires: automake autoconf libtool pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.1.5
 BuildRequires: libudev-devel
+BuildRequires: xorg-x11-glamor-devel
 
 Requires: Xorg %(xserver-sdk-abi-requires ansic)
 Requires: Xorg %(xserver-sdk-abi-requires videodrv)
@@ -44,10 +46,11 @@ 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
-%configure --disable-static
+%configure --disable-static --enable-glamor
 make %{?_smp_mflags}
 
 %install
@@ -71,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Apr 08 2013 Jerome Glisse <jglisse at redhat.com> 7.1.0-4
+- Git snapshot
+- Enable glamor acceleration for southern island GPU
+
 * Tue Mar 19 2013 Adam Jackson <ajax at redhat.com> 7.1.0-3
 - Less RHEL customization