MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

patch ati-drivers for kernel 4.9

Browse source 
uses patch from https://github.com/imageguy/fglrx-for-Fedora/blob/master/fglrx_kernel_4.9.diff
This commit is contained in:
Matt McHenry 2017-02-03 20:25:38 -05:00 committed by Tuomas Tynkkynen
parent db8ac6144e
commit 166464b5ad
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/os-specific/linux/ati-drivers/default.nix
View file

@ -80,7 +80,10 @@ stdenv.mkDerivation rec {
./patches/kernel-4.6-page_cache_release-put_page.patch ]
++ optionals ( kernel != null &&
(lib.versionAtLeast kernel.version "4.7") )
[ ./patches/4.7-arch-cpu_has_pge-v2.patch ];
[ ./patches/4.7-arch-cpu_has_pge-v2.patch ]
++ optionals ( kernel != null &&
(lib.versionAtLeast kernel.version "4.9") )
[ ./patches/4.9-get_user_pages.patch ];
buildInputs =
[ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM

28
pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch Normal file
View file

@ -0,0 +1,28 @@
commit b3e4353fc68a6a024dcb95e2d61aa0afd7370233
Author: Matt McHenry <matt@mchenryfamily.org>
Date: Fri Feb 3 20:19:41 2017
patch for 4.9 only
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
index 4ce095f..3b591e1 100755
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
@@ -3224,7 +3224,7 @@ int ATI_API_CALL KCL_LockUserPages(unsigned long vaddr, unsigned long* page_list
int ret;
down_read(&current->mm->mmap_sem);
- ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);
+ ret = get_user_pages(vaddr, page_cnt, 1, (struct page **)page_list, NULL);
up_read(&current->mm->mmap_sem);
return ret;
@@ -3242,7 +3242,7 @@ int ATI_API_CALL KCL_LockReadOnlyUserPages(unsigned long vaddr, unsigned long* p
int ret;
down_read(&current->mm->mmap_sem);
- ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);
+ ret = get_user_pages(vaddr, page_cnt, 0, (struct page **)page_list, NULL);
up_read(&current->mm->mmap_sem);
return ret;