Author: leigh123linux Update of /cvs/nonfree/rpms/catalyst-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19826 Modified Files: catalyst-kmod.spec kernel_4.1-remove-IRQF_DISABLED.patch kernel_4.2_FPU.patch sources Added Files: kernel_4.0-strn.patch Removed Files: kernel_4.0-cr4-strn.patch Log Message: * Wed Sep 16 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:15.9-1 - Update to Catalyst 15.9 (internal version 15.201.1151) kernel_4.0-strn.patch: kcl_str.c | 4 ++++ 1 file changed, 4 insertions(+) --- NEW FILE kernel_4.0-strn.patch --- --- lib/modules/fglrx/build_mod/kcl_str.c +++ lib/modules/fglrx/build_mod/kcl_str.c @@ -169,7 +169,11 @@ int ATI_API_CALL KCL_STR_Strnicmp(const const char* s2, KCL_TYPE_SizeSigned count) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) return strnicmp(s1, s2, count); +#else + return strncasecmp(s1, s2, count); +#endif } /** \brief Locate character in string Index: catalyst-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/catalyst-kmod.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- catalyst-kmod.spec 23 Aug 2015 14:17:27 -0000 1.32 +++ catalyst-kmod.spec 16 Sep 2015 13:57:37 -0000 1.33 @@ -13,8 +13,8 @@ Name: catalyst-kmod Epoch: 1 -Version: 15.7 -Release: 5%{?dist} +Version: 15.9 +Release: 1%{?dist} # Taken over by kmodtool Summary: AMD display driver kernel module Group: System Environment/Kernel @@ -23,8 +23,8 @@ Source0: http://downloads.diffingo.com/rpmfusion/kmod-data/catalyst-kmod-data-%{ve... Source11: catalyst-kmodtool-excludekernel-filterfile Patch0: compat_alloc-Makefile.patch -Patch1: kernel_4.0-cr4-strn.patch -Patch2: kernel_4.1-remove-IRQF_DISABLED.patch +Patch1: kernel_4.1-remove-IRQF_DISABLED.patch +Patch2: kernel_4.0-strn.patch Patch3: kernel_4.2_FPU.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -105,6 +105,9 @@ %changelog +* Wed Sep 16 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:15.9-1 +- Update to Catalyst 15.9 (internal version 15.201.1151) + * Sun Aug 23 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:15.7-5 - merge 4.1.3-kernel-compatibility-fixes into kernel_4.1-remove-IRQF_DISABLED patch - Patch for 4.2 kernel kernel_4.1-remove-IRQF_DISABLED.patch: firegl_public.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) Index: kernel_4.1-remove-IRQF_DISABLED.patch =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/kernel_4.1-remove-IRQF_DISABLED.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kernel_4.1-remove-IRQF_DISABLED.patch 23 Aug 2015 14:17:27 -0000 1.3 +++ kernel_4.1-remove-IRQF_DISABLED.patch 16 Sep 2015 13:57:37 -0000 1.4 @@ -1,28 +1,15 @@ --- lib/modules/fglrx/build_mod/firegl_public.c +++ lib/modules/fglrx/build_mod/firegl_public.c -@@ -3498,7 +3498,11 @@ +@@ -3506,7 +3506,11 @@ #else //when MSI enabled. keep irq disabled when calling the action handler, //exclude this IRQ from irq balancing (only on one CPU) +- ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)), +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) - ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)), ++ ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)), +#else -+ ((useMSI) ? (IRQF_TRIGGER_NONE) : (IRQF_SHARED)), -+#endif ++ ((useMSI) ? (IRQF_TRIGGER_NONE) : (IRQF_SHARED)), ++#endif #endif dev_name, context); ---- lib/modules/fglrx/build_mod/kcl_acpi.c -+++ lib/modules/fglrx/build_mod/kcl_acpi.c -@@ -861,7 +861,11 @@ void ATI_API_CALL KCL_ACPI_No_Hotplug(void* dev) - #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) - if(pdev) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3) - pci_ignore_hotplug(pdev); -+#else -+ pdev->ignore_hotplug = 1; -+#endif - } - #endif - } kernel_4.2_FPU.patch: firegl_public.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) Index: kernel_4.2_FPU.patch =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/kernel_4.2_FPU.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kernel_4.2_FPU.patch 23 Aug 2015 14:17:27 -0000 1.1 +++ kernel_4.2_FPU.patch 16 Sep 2015 13:57:37 -0000 1.2 @@ -30,7 +30,7 @@ #endif #include "firegl_public.h" -@@ -1698,6 +1706,9 @@ void ATI_API_CALL KCL_SetCurrentProcessState(KCL_ENUM_ProcessState state) +@@ -1706,6 +1714,9 @@ void ATI_API_CALL KCL_SetCurrentProcessState(KCL_ENUM_ProcessState state) #if defined(__i386__) #ifndef __HAVE_ARCH_CMPXCHG @@ -40,7 +40,7 @@ static inline unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size) -@@ -1734,7 +1745,11 @@ unsigned long ATI_API_CALL kcl__cmpxchg(volatile void *ptr, unsigned long old, +@@ -1742,7 +1753,11 @@ unsigned long ATI_API_CALL kcl__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size) { #ifndef __HAVE_ARCH_CMPXCHG @@ -52,7 +52,7 @@ #else /* On kernel version 2.6.34 passing a variable or unsupported size * argument to the __cmpxchg macro causes the default-clause of a -@@ -6450,21 +6465,36 @@ static int KCL_fpu_save_init(struct task_struct *tsk) +@@ -6440,21 +6455,36 @@ static int KCL_fpu_save_init(struct task_struct *tsk) struct fpu *fpu = &tsk->thread.fpu; if(static_cpu_has(X86_FEATURE_XSAVE)) { @@ -89,7 +89,7 @@ return 1; } #endif -@@ -6476,8 +6506,12 @@ static int KCL_fpu_save_init(struct task_struct *tsk) +@@ -6466,8 +6496,12 @@ static int KCL_fpu_save_init(struct task_struct *tsk) void ATI_API_CALL KCL_fpu_begin(void) { #ifdef CONFIG_X86_64 @@ -102,7 +102,7 @@ #ifdef TS_USEDFPU struct thread_info *cur_thread = current_thread_info(); struct task_struct *cur_task = get_current(); -@@ -6522,7 +6556,11 @@ void ATI_API_CALL KCL_fpu_begin(void) +@@ -6512,7 +6546,11 @@ void ATI_API_CALL KCL_fpu_begin(void) */ void ATI_API_CALL KCL_fpu_end(void) { Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 11 Jul 2015 15:54:53 -0000 1.10 +++ sources 16 Sep 2015 13:57:37 -0000 1.11 @@ -1 +1 @@ -81e568945c35417a60c497ce6be2ded5 catalyst-kmod-data-15.7.tar.bz2 +dd1511326a0d4a1aa1c82a46c3189834 catalyst-kmod-data-15.9.tar.bz2 --- kernel_4.0-cr4-strn.patch DELETED ---