ati-driver: Fix support for linux kernel 3.17
This commit is contained in:
parent
3525f7135f
commit
b15311027f
@ -44,7 +44,7 @@ stdenv.mkDerivation {
|
|||||||
curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
|
curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
|
||||||
};
|
};
|
||||||
|
|
||||||
# most patches are taken from gentoo
|
patchPhase = "patch -p1 < ${./fglrx_3.17rc6-no_hotplug.patch}";
|
||||||
patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}";
|
patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}";
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
@ -0,0 +1,31 @@
|
|||||||
|
source: https://aur.archlinux.org/packages/catalyst/
|
||||||
|
|
||||||
|
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;
|
Loading…
x
Reference in New Issue
Block a user