[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/

["Emil Karlson" <jekarlson@gmail.com>]

commit:     64ef31b71805499db28970b50538ddcfffd060b4
Author:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
AuthorDate: Sun Dec 23 16:53:49 2012 +0000
Commit:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
CommitDate: Sun Dec 23 16:53:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=64ef31b7

ati-drivers: patch for linux-3.8 compatibility.

Thanks to Fabio Rossi <rossi.f <AT> inwind.it> for the patch.

---
 .../ati-drivers/ati-drivers-12.11_beta11.ebuild    |    4 ++++
 .../ati-drivers-12.6_beta_pre897.ebuild            |    4 ++++
 .../files/ati-drivers-kernel-3.8-acpihandle.patch  |   15 +++++++++++++++
 3 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.11_beta11.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.11_beta11.ebuild
index 5dfac04..e5b5fc9 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.11_beta11.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.11_beta11.ebuild
@@ -341,6 +341,10 @@ src_prepare() {
 	# compile fix for AGP-less kernel, bug #435322
 	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
 
+	# Use ACPI_DEVICE_HANDLE wrapper to make driver build on linux-3.8
+	# see https://bugs.gentoo.org/show_bug.cgi?id=448216 
+	epatch "${FILESDIR}/ati-drivers-kernel-3.8-acpihandle.patch"
+
 	cd "${MODULE_DIR}"
 
 	# bugged fglrx build system, this file should be copied by hand

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
index cd05be3..7522018 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
@@ -326,6 +326,10 @@ src_prepare() {
 	#fixes bug #420751
 	epatch "${FILESDIR}"/ati-drivers-do_mmap.patch
 
+	# Use ACPI_DEVICE_HANDLE wrapper to make driver build on linux-3.8
+	# see https://bugs.gentoo.org/show_bug.cgi?id=448216 
+	epatch "${FILESDIR}/ati-drivers-kernel-3.8-acpihandle.patch"
+
 	cd "${MODULE_DIR}"
 
 	# bugged fglrx build system, this file should be copied by hand

diff --git a/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch b/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch
new file mode 100644
index 0000000..bdff4fb
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch
@@ -0,0 +1,15 @@
+--- common/lib/modules/fglrx/build_mod/kcl_acpi.c	2012-07-04 21:43:47.000000000 +0200
++++ common/lib/modules/fglrx/build_mod/kcl_acpi.c.new	2012-12-23 11:25:38.000000000 +0100
+@@ -775,11 +775,7 @@
+ unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
+ {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
+-    #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
+-        pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
+-    #else 
+-        pInfo->video_handle = pInfo->pcidev->dev.firmware_data;
+-    #endif    
++    pInfo->video_handle = DEVICE_ACPI_HANDLE(&pInfo->pcidev->dev);
+     if ( pInfo->video_handle &&
+         (KCL_ACPI_videoDevice(pInfo->video_handle) != KCL_ACPI_OK) )
+     {