[xorg-x11-drv-ati] radeon-no-ums.patch: Disable UMS support entirely. Just Say No.™

[Adam Jackson]

commit 4ba493d33d7428a037c01df321d22cf7524aa6ca
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Mar 28 15:49:48 2012 -0400

    radeon-no-ums.patch: Disable UMS support entirely. Just Say No.™

 radeon-no-ums.patch   |   21 +++++++++++++++++++++
 xorg-x11-drv-ati.spec |    7 ++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/radeon-no-ums.patch b/radeon-no-ums.patch
new file mode 100644
index 0000000..7d6d311
--- /dev/null
+++ b/radeon-no-ums.patch
@@ -0,0 +1,21 @@
+diff -up xf86-video-ati-20120206/src/radeon_probe.c.jx xf86-video-ati-20120206/src/radeon_probe.c
+--- xf86-video-ati-20120206/src/radeon_probe.c.jx	2012-02-01 09:41:05.000000000 -0500
++++ xf86-video-ati-20120206/src/radeon_probe.c	2012-03-28 15:41:00.658773763 -0400
+@@ -183,16 +183,7 @@ radeon_get_scrninfo(int entity_num, void
+       pScrn->ValidMode     = RADEONValidMode;
+     } else 
+ #endif 
+-    {
+-      pScrn->PreInit       = RADEONPreInit;
+-      pScrn->ScreenInit    = RADEONScreenInit;
+-      pScrn->SwitchMode    = RADEONSwitchMode;
+-      pScrn->AdjustFrame   = RADEONAdjustFrame;
+-      pScrn->EnterVT       = RADEONEnterVT;
+-      pScrn->LeaveVT       = RADEONLeaveVT;
+-      pScrn->FreeScreen    = RADEONFreeScreen;
+-      pScrn->ValidMode     = RADEONValidMode;
+-    }
++      return FALSE;
+ 
+     pEnt = xf86GetEntityInfo(entity_num);
+ 
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index 0fe35d1..c8f5c40 100644
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@ -11,7 +11,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.14.3
-Release:   11%{?gver}%{?dist}
+Release:   12%{?gver}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -22,6 +22,7 @@ Source0: %{tarball}-%{gitdate}.tar.xz
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
+Patch14:    radeon-no-ums.patch
 
 ExcludeArch: s390 s390x
 
@@ -44,6 +45,7 @@ X.Org X11 ati video driver.
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
+%patch14 -p1 -b .no-ums
 
 %build
 autoreconf -iv
@@ -71,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Mar 28 2012 Adam Jackson <ajax at redhat.com> 6.14.3-12
+- radeon-no-ums.patch: Disable UMS support entirely. Just Say No.™
+
 * Mon Mar 05 2012 Adam Jackson <ajax at redhat.com> 6.14.3-11
 - Don't package UMS theatre support
 - Trim some Requires that haven't been necessary since at least F13