diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 09:02:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 09:02:10 +0200 |
| commit | 0b192a09767c05b38f3e2838c07e9600318bbbb5 (patch) | |
| tree | 4467053c39ef4bad71527cd5fda5cf92960575e8 /pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch | |
| parent | dc5bbc4700dd95420f87141efcc0e6cb48a710f9 (diff) | |
| parent | 0e54c749114b79f6be78486086f5829b176fcba8 (diff) | |
| download | nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.gz nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.bz2 nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.lz nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.xz nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.zst nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.zip | |
Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
Diffstat (limited to 'pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch')
| -rw-r--r-- | pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch b/pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch new file mode 100644 index 00000000000..22e43fc0c7b --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/patches/15.12-xstate-fp.patch @@ -0,0 +1,26 @@ +From: Krzysztof Kolasa <kkolasa@winsoft.pl> +Date: Thu, 26 Nov 2015 14:28:46 +0100 +Subject: [PATCH] Patch for kernel 4.4.0-rc2 + +constant change of name XSTATE_XP to name XFEATURE_MASK_FP +--- + firegl_public.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 3626c7b..f071d42 100644 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod//firegl_public.c +@@ -6463,7 +6463,11 @@ static int KCL_fpu_save_init(struct task_struct *tsk) + if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) + #else + copy_xregs_to_kernel(&fpu->state.xsave); +- if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0) ++ if (!(fpu->state.xsave.header.xfeatures & XFEATURE_MASK_FP)) ++#else ++ if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) ++#endif + #endif + return 1; + } else if (static_cpu_has(X86_FEATURE_FXSR)) { |