Author: leigh123linux Update of /cvs/nonfree/rpms/catalyst-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4914 Modified Files: catalyst-kmod.spec kernel_4.0-cr4-strn.patch kernel_4.1-remove-IRQF_DISABLED.patch Added Files: 4.1.3-kernel-compatibility-fixes.patch Log Message: * Mon Aug 10 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:15.7-4 - use the suse fix for the GPL breakage 4.1.3-kernel-compatibility-fixes.patch: kcl_acpi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- NEW FILE 4.1.3-kernel-compatibility-fixes.patch --- --- lib/modules/fglrx/build_mod/kcl_acpi.c +++ lib/modules/fglrx/build_mod/kcl_acpi.c @@ -861,7 +861,8 @@ void ATI_API_CALL KCL_ACPI_No_Hotplug(vo #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) if(pdev) { - pci_ignore_hotplug(pdev); + //pci_ignore_hotplug(pdev); + pdev->ignore_hotplug = 1; } #endif } Index: catalyst-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/catalyst-kmod.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- catalyst-kmod.spec 7 Aug 2015 08:13:54 -0000 1.28 +++ catalyst-kmod.spec 10 Aug 2015 17:08:01 -0000 1.29 @@ -3,7 +3,7 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%global buildforkernels newest +%global buildforkernels current # Tweak to have debuginfo - part 1/2 %if 0%{?fedora} > 7 @@ -14,7 +14,7 @@ Name: catalyst-kmod Epoch: 1 Version: 15.7 -Release: 3%{?dist}.2 +Release: 4%{?dist} # Taken over by kmodtool Summary: AMD display driver kernel module Group: System Environment/Kernel @@ -25,9 +25,7 @@ Patch0: compat_alloc-Makefile.patch Patch1: kernel_4.0-cr4-strn.patch Patch2: kernel_4.1-remove-IRQF_DISABLED.patch -# I shouldn't have to do this but the kernel devs are being wankers -# https://lkml.org/lkml/2015/7/19/233 -Patch3: fglrx_gpl_symbol.patch +Patch3: 4.1.3-kernel-compatibility-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,6 +105,9 @@ %changelog +* Mon Aug 10 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:15.7-4 +- use the suse fix for the GPL breakage + * Fri Aug 07 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:15.7-3.2 - Rebuilt for kernel kernel_4.0-cr4-strn.patch: firegl_public.c | 18 ++++++++++++++++++ kcl_str.c | 4 ++++ 2 files changed, 22 insertions(+) Index: kernel_4.0-cr4-strn.patch =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/kernel_4.0-cr4-strn.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kernel_4.0-cr4-strn.patch 11 Jul 2015 14:33:32 -0000 1.1 +++ kernel_4.0-cr4-strn.patch 10 Aug 2015 17:08:01 -0000 1.2 @@ -1,6 +1,6 @@ --- lib/modules/fglrx/build_mod/firegl_public.c +++ lib/modules/fglrx/build_mod/firegl_public.c -@@ -4468,8 +4468,13 @@ +@@ -4498,8 +4498,13 @@ static void kcl_mem_pat_setup (void *inf if (cpu_has_pge) { @@ -14,7 +14,7 @@ } __flush_tlb(); -@@ -4482,7 +4487,11 @@ +@@ -4512,7 +4517,11 @@ static void kcl_mem_pat_setup (void *inf write_cr0(cr0 & 0xbfffffff); if (cpu_has_pge) { @@ -26,7 +26,7 @@ } local_irq_restore(flags); -@@ -4509,8 +4518,13 @@ +@@ -4539,8 +4548,13 @@ static void kcl_mem_pat_restore (void *i if (cpu_has_pge) { @@ -40,7 +40,7 @@ } __flush_tlb(); -@@ -4522,7 +4536,11 @@ +@@ -4552,7 +4566,11 @@ static void kcl_mem_pat_restore (void *i write_cr0(cr0 & 0xbfffffff); if (cpu_has_pge) { @@ -54,7 +54,7 @@ --- lib/modules/fglrx/build_mod/kcl_str.c +++ lib/modules/fglrx/build_mod/kcl_str.c -@@ -169,7 +169,11 @@ +@@ -169,7 +169,11 @@ int ATI_API_CALL KCL_STR_Strnicmp(const const char* s2, KCL_TYPE_SizeSigned count) { kernel_4.1-remove-IRQF_DISABLED.patch: firegl_public.c | 4 ++++ 1 file changed, 4 insertions(+) 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kernel_4.1-remove-IRQF_DISABLED.patch 13 Jul 2015 16:39:22 -0000 1.1 +++ kernel_4.1-remove-IRQF_DISABLED.patch 10 Aug 2015 17:08:01 -0000 1.2 @@ -1,15 +1,14 @@ ---- lib/modules/fglrx/build_mod/firegl_public.c 2015-07-04 15:31:23.000000000 +0100 -+++ lib/modules/fglrx/build_mod/firegl_public.c 2015-07-13 17:22:23.850772235 +0100 -@@ -3498,7 +3498,11 @@ int ATI_API_CALL KCL_InstallInterruptHan +--- lib/modules/fglrx/build_mod/firegl_public.c ++++ lib/modules/fglrx/build_mod/firegl_public.c +@@ -3498,7 +3498,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_SHARED)), -+#endif ++ ((useMSI) ? (IRQF_TRIGGER_NONE) : (IRQF_SHARED)), ++#endif #endif dev_name, context);