commit ef56bf22ac5f4b846a5c0c4440331cda56e793bf
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sun Nov 9 18:38:56 2014 +0100
- fix building with linux 3.17
- rel 2
linux-3.17.patch | 29 +++++++++++++++++++++++++++++
xorg-driver-video-fglrx.spec | 6 +++++-
2 files changed, 34 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 4d77e64..6ceceb1 100644
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -51,7 +51,7 @@ exit 1
%define betaver 1.0
#define rel 0.beta%{betaver}.3
-%define rel 1
+%define rel 2
%define pname xorg-driver-video-fglrx
Summary: Linux Drivers for AMD/ATI graphics accelerators
Summary(pl.UTF-8): Sterowniki do akceleratorów graficznych AMD/ATI
@@ -79,6 +79,8 @@ Patch2: %{pname}-x86genericarch.patch
Patch3: %{pname}-desktop.patch
Patch4: %{pname}-nofinger.patch
Patch5: %{pname}-GPL-only.patch
+Patch6: %{pname}-intel_iommu.patch
+Patch7: linux-3.17.patch
URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html
%{?with_dist_kernel:%{expand:%kbrs}}
BuildRequires: rpmbuild(macros) >= 1.678
@@ -252,6 +254,8 @@ EOF
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
install -d common{%{_prefix}/{%{_lib},bin,sbin},/etc}
cp -a %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}
diff --git a/linux-3.17.patch b/linux-3.17.patch
new file mode 100644
index 0000000..7fbe1a2
--- /dev/null
+++ b/linux-3.17.patch
@@ -0,0 +1,29 @@
+diff -uNr 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c
14.9/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-09-09
16:10:17.000000000 +0200
++++ 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-09-26
19:01:44.000000000 +0200
+@@ -1093,6 +1093,9 @@
+ // directly here to allow suspend/resume without X server start.
+ firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev);
+ pci_disable_device(pdev);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
++ pci_ignore_hotplug(pdev);
++#endif
+ PMSG_EVENT(pdev->dev.power.power_state) = state;
+ }
+ else
+diff -uNr 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c
14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-09-09
16:10:17.000000000 +0200
++++ 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-09-26
18:57:27.000000000 +0200
+@@ -840,10 +840,12 @@
+ if(tdev != NULL)
+ {
+ device = (acpi_device_adr(tdev) >> 16) & 0xffff;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
+ if(PCI_SLOT(pdev->devfn) == device)
+ {
+ tdev->flags.no_hotplug = true;
+ }
++#endif
+ }
+ #endif
+ return 0;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-fglrx.git/commitdiff/ef56bf22ac5f4b846a5c0c4440331cda56e793bf
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
