Gentoo Archives: gentoo-commits

From: Emil Karlson <jekarlson@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/files/
Date: Wed, 22 Jan 2014 21:48:16
Message-Id: 1390427143.82f36270ffb88a0addf9bb8638d8922aee353f8b.emil_karlson@gentoo
1 commit: 82f36270ffb88a0addf9bb8638d8922aee353f8b
2 Author: Emil Karlson <jekarlson <AT> gmail <DOT> com>
3 AuthorDate: Wed Jan 22 21:45:43 2014 +0000
4 Commit: Emil Karlson <jekarlson <AT> gmail <DOT> com>
5 CommitDate: Wed Jan 22 21:45:43 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=82f36270
7
8 x11-drivers/ati-drivers: patch support for linux-3.13 for legacy branch
9
10 Thanks to Helmut Jarausch for providing the patch.
11
12 ---
13 .../files/ati-drivers-kernel-3.8-acpihandle.patch | 14 ++++++++------
14 1 file changed, 8 insertions(+), 6 deletions(-)
15
16 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
17 index bdff4fb..145abc7 100644
18 --- a/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch
19 +++ b/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch
20 @@ -1,6 +1,6 @@
21 ---- common/lib/modules/fglrx/build_mod/kcl_acpi.c 2012-07-04 21:43:47.000000000 +0200
22 -+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c.new 2012-12-23 11:25:38.000000000 +0100
23 -@@ -775,11 +775,7 @@
24 +--- common/lib/modules/fglrx/build_mod/kcl_acpi.c.ORIG 2014-01-21 10:38:08.951838343 +0100
25 ++++ common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-01-21 10:42:25.728845582 +0100
26 +@@ -775,10 +775,10 @@
27 unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
28 {
29 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
30 @@ -8,8 +8,10 @@
31 - pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
32 - #else
33 - pInfo->video_handle = pInfo->pcidev->dev.firmware_data;
34 -- #endif
35 -+ pInfo->video_handle = DEVICE_ACPI_HANDLE(&pInfo->pcidev->dev);
36 ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
37 ++ pInfo->video_handle = (acpi_handle)ACPI_HANDLE(&pInfo->pcidev->dev);
38 ++ #else
39 ++ pInfo->video_handle = DEVICE_ACPI_HANDLE(&pInfo->pcidev->dev);
40 + #endif
41 if ( pInfo->video_handle &&
42 (KCL_ACPI_videoDevice(pInfo->video_handle) != KCL_ACPI_OK) )
43 - {