From 7e0400367a53d8351d2925352b5bf4962f773333 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 11 Jul 2015 09:21:53 +0200 Subject: [PATCH] catalyst: linux-4.1 patch via AUR. --- .../files/kolasa_4.1_remove-IRQF_DISABLED.patch | 15 +++++++++++++++ srcpkgs/catalyst/template | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/catalyst/files/kolasa_4.1_remove-IRQF_DISABLED.patch diff --git a/srcpkgs/catalyst/files/kolasa_4.1_remove-IRQF_DISABLED.patch b/srcpkgs/catalyst/files/kolasa_4.1_remove-IRQF_DISABLED.patch new file mode 100644 index 00000000000..176359a9484 --- /dev/null +++ b/srcpkgs/catalyst/files/kolasa_4.1_remove-IRQF_DISABLED.patch @@ -0,0 +1,15 @@ +--- 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-07-04 16:31:23.000000000 +0200 ++++ 15.7a/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-07-09 17:40:58.611608136 +0200 +@@ -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_NOBALANCING) : (IRQF_SHARED)), ++#else ++ ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)), ++#endif + #endif + dev_name, + context); diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template index 7f34d920f57..7cb0eff30ba 100644 --- a/srcpkgs/catalyst/template +++ b/srcpkgs/catalyst/template @@ -3,9 +3,9 @@ _desc="AMD catalyst driver for Linux" pkgname=catalyst version=15.20.1046 -revision=1 +revision=2 maintainer="Juan RP " -license="Propietary AMD license" +license="Proprietary AMD license" homepage="http://www.amd.com" only_for_archs="i686 x86_64" @@ -35,6 +35,7 @@ do_build() { cd fglrx-${version} patch -Np1 -i ${FILESDIR}/kolasa_4.0-cr4-strn.patch + patch -Np1 -i ${FILESDIR}/kolasa_4.1_remove-IRQF_DISABLED.patch } do_install() { cd fglrx-${version}