* [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/files/
@ 2012-05-28 17:01 Enrico Tagliavini
0 siblings, 0 replies; 4+ messages in thread
From: Enrico Tagliavini @ 2012-05-28 17:01 UTC (permalink / raw
To: gentoo-commits
commit: 2d0f0cc2aa867203e15bf7cd2f57e5a447793681
Author: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
AuthorDate: Mon May 28 17:01:07 2012 +0000
Commit: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
CommitDate: Mon May 28 17:01:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2d0f0cc2
add missing patch ati-drivers-old_rsp.patch remove old
---
.../ati-drivers/files/ati-drivers-old_rsp.patch | 24 ++++++++++++
.../files/ati-drivers-redefine-WARN.patch | 39 --------------------
2 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch b/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch
new file mode 100644
index 0000000..321e5ed
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch
@@ -0,0 +1,24 @@
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-05-26 18:33:25.044695179 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-05-26 18:28:39.692699095 +0200
+@@ -4154,7 +4154,7 @@
+ {
+ unsigned int p;
+ KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init);
+- for_each_cpu_mask(p, cpu_possible_map)
++ for_each_possible_cpu(p)
+ {
+ KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p);
+ preempt_disable();
+--- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c 2012-05-26 19:11:03.402987821 +0200
++++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c 2012-05-26 19:13:00.273986422 +0200
+@@ -217,6 +217,10 @@
+ * \param size [in] Number of bytes to allocate
+ * \return Pointer to allocated memory
+ */
++#ifndef CONFIG_X86_X32
++DEFINE_PER_CPU(unsigned long, old_rsp);
++#endif
++
+ void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
+ {
+ void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch b/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch
deleted file mode 100644
index fe5ed2f..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig 2011-12-30 14:32:00.271391437 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.h 2011-12-30 15:48:21.647473696 +0100
-@@ -85,8 +85,8 @@
- #ifdef ERROR
- #undef ERROR
- #endif
--#ifdef WARN
--#undef WARN
-+#ifdef AMD_WARN
-+#undef AMD_WARN
- #endif
- #ifdef INFO
- #undef INFO
-@@ -122,7 +122,7 @@
- {
- SPECIAL = 0,
- ERROR ,
-- WARN ,
-+ AMD_WARN ,
- INFO ,
- INFOEX,
- TRACE,
-@@ -163,14 +163,14 @@
- {
- {SPECIAL , 'S'},
- {ERROR , 'E'},
-- {WARN , 'W'},
-+ {AMD_WARN , 'W'},
- {INFO , 'I'},
- {INFOEX , 'X'},
- {TRACE , 'T'},
- {PERFORMANCE , 'P'},
- {DUMP , 'D'},
- };
--#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) ))
-+#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) ))
- #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX)))
- static module_map module_type_map[LOG_M_MAX] =
- {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/files/
@ 2013-09-19 7:54 Emil Karlson
0 siblings, 0 replies; 4+ messages in thread
From: Emil Karlson @ 2013-09-19 7:54 UTC (permalink / raw
To: gentoo-commits
commit: f9b0edb748957325b1bbfc19793492e6ec34ee13
Author: Emil Karlson <jekarlson <AT> gmail <DOT> com>
AuthorDate: Wed Sep 18 20:26:42 2013 +0000
Commit: Emil Karlson <jekarlson <AT> gmail <DOT> com>
CommitDate: Thu Sep 19 06:05:20 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f9b0edb7
x11-drivers/ati-drivers: remove unreferenced patches
---
.../ati-drivers/files/amd-drivers-3.2.7.1.patch | 19 ----------
.../files/ati-drivers-12.2-redefine-WARN.patch | 42 ----------------------
2 files changed, 61 deletions(-)
diff --git a/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch b/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch
deleted file mode 100644
index 104c878..0000000
--- a/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -5797,10 +5797,16 @@ void ATI_API_CALL KCL_fpu_begin(void)
- #ifdef CONFIG_X86_64
- kernel_fpu_begin();
- #else
-+#ifndef TS_USEDFPU
-+ preempt_disable();
-+ if (__thread_has_fpu(current))
-+ __save_init_fpu(current);
-+#else
- struct thread_info *cur_task = current_thread_info();
- preempt_disable();
- if (cur_task->status & TS_USEDFPU)
- __save_init_fpu(cur_task->task);
-+#endif
- else
- clts();
- #endif
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch b/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch
deleted file mode 100644
index f4fab43..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig 2012-03-08 19:30:38.195025328 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.h 2012-03-08 19:31:24.976024507 +0100
-@@ -85,8 +85,8 @@
- #ifdef ERROR
- #undef ERROR
- #endif
--#ifdef WARN
--#undef WARN
-+#ifdef AMD_WARN
-+#undef AMD_WARN
- #endif
- #ifdef INFO
- #undef INFO
-@@ -122,7 +122,7 @@
- {
- SPECIAL = 0,
- ERROR ,
-- WARN ,
-+ AMD_WARN ,
- INFO ,
- INFOEX,
- TRACE,
-@@ -160,7 +160,7 @@
- }log_map;
-
-
--#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) ))
-+#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) ))
- #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX)))
- extern const log_map module_log_map[];
- extern const module_map module_type_map[];
---- common/lib/modules/fglrx/build_mod/kcl_debug.c.orig 2012-03-08 19:36:18.244019310 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.c 2012-03-08 19:36:36.197018973 +0100
-@@ -69,7 +69,7 @@
- {
- {SPECIAL , 'S'},
- {ERROR , 'E'},
-- {WARN , 'W'},
-+ {AMD_WARN , 'W'},
- {INFO , 'I'},
- {INFOEX , 'X'},
- {TRACE , 'T'},
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/files/
@ 2014-01-22 21:48 Emil Karlson
0 siblings, 0 replies; 4+ messages in thread
From: Emil Karlson @ 2014-01-22 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 82f36270ffb88a0addf9bb8638d8922aee353f8b
Author: Emil Karlson <jekarlson <AT> gmail <DOT> com>
AuthorDate: Wed Jan 22 21:45:43 2014 +0000
Commit: Emil Karlson <jekarlson <AT> gmail <DOT> com>
CommitDate: Wed Jan 22 21:45:43 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=82f36270
x11-drivers/ati-drivers: patch support for linux-3.13 for legacy branch
Thanks to Helmut Jarausch for providing the patch.
---
.../files/ati-drivers-kernel-3.8-acpihandle.patch | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
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
index bdff4fb..145abc7 100644
--- 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
@@ -1,6 +1,6 @@
---- 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 @@
+--- common/lib/modules/fglrx/build_mod/kcl_acpi.c.ORIG 2014-01-21 10:38:08.951838343 +0100
++++ common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-01-21 10:42:25.728845582 +0100
+@@ -775,10 +775,10 @@
unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
{
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
@@ -8,8 +8,10 @@
- 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 LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
++ pInfo->video_handle = (acpi_handle)ACPI_HANDLE(&pInfo->pcidev->dev);
++ #else
++ pInfo->video_handle = DEVICE_ACPI_HANDLE(&pInfo->pcidev->dev);
+ #endif
if ( pInfo->video_handle &&
(KCL_ACPI_videoDevice(pInfo->video_handle) != KCL_ACPI_OK) )
- {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/files/
@ 2014-01-31 20:08 Emil Karlson
0 siblings, 0 replies; 4+ messages in thread
From: Emil Karlson @ 2014-01-31 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 1fe6ab580888796f069810a1c33c8108d6be0da7
Author: Emil Karlson <jekarlson <AT> gmail <DOT> com>
AuthorDate: Fri Jan 31 20:06:46 2014 +0000
Commit: Emil Karlson <jekarlson <AT> gmail <DOT> com>
CommitDate: Fri Jan 31 20:06:46 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1fe6ab58
x11-drivers/ati-drivers: fix quoting in ati-powermode-opt-path-3.patch
Thanks to Zdeněk Žamberský for providing the fix
---
x11-drivers/ati-drivers/files/ati-powermode-opt-path-3.patch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-3.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-3.patch
index 106e67e..278c191 100644
--- a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-3.patch
+++ b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-3.patch
@@ -14,7 +14,7 @@
#If PPLIB is enabled
-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
++su $user -c "$aticonfig --pplib-cmd='get version'" | grep PPLIB
if [ $? = 0 ]; then
echo "Has PPLIB"
has_pplib=1
@@ -23,7 +23,7 @@
echo "Low power"
if [ ${has_pplib} -eq 1 ]; then
- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
++ su $user -c "$aticonfig --pplib-cmd='notify psrc dc'"
else
- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
+ su $user -c "$aticonfig --set-powerstate=1 --effective=now"
@@ -32,7 +32,7 @@
echo "high power"
if [ ${has_pplib} -eq 1 ]; then
- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
++ su $user -c "$aticonfig --pplib-cmd='notify psrc ac'"
else
- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
+ su $user -c "$aticonfig --set-powerstate=3 --effective=now"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-31 20:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-19 7:54 [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/files/ Emil Karlson
-- strict thread matches above, loose matches on Subject: below --
2014-01-31 20:08 Emil Karlson
2014-01-22 21:48 Emil Karlson
2012-05-28 17:01 Enrico Tagliavini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox