[Pkg-fglrx-devel] r1574 - in fglrx-driver/branches/15.12/debian: . patches
Andreas Beckmann
anbe at moszumanska.debian.org
Sun Jan 17 22:19:24 UTC 2016
Author: anbe
Date: 2016-01-17 22:19:24 +0000 (Sun, 17 Jan 2016)
New Revision: 1574
Removed:
fglrx-driver/branches/15.12/debian/patches/04-3.17rc6-no_hotplug.patch
fglrx-driver/branches/15.12/debian/patches/05-4.0.0-build.patch
fglrx-driver/branches/15.12/debian/patches/07-4.1.0-build.patch
fglrx-driver/branches/15.12/debian/patches/08-4.2.0-build.patch
fglrx-driver/branches/15.12/debian/patches/09-4.2.0-build.fpregs_active.patch
fglrx-driver/branches/15.12/debian/patches/11-4.1.0-gpl-only.patch
Modified:
fglrx-driver/branches/15.12/debian/changelog
fglrx-driver/branches/15.12/debian/patches/series
Log:
drop/disable fixed/superfluous patches
Modified: fglrx-driver/branches/15.12/debian/changelog
===================================================================
--- fglrx-driver/branches/15.12/debian/changelog 2016-01-16 04:01:28 UTC (rev 1573)
+++ fglrx-driver/branches/15.12/debian/changelog 2016-01-17 22:19:24 UTC (rev 1574)
@@ -4,6 +4,11 @@
* get-orig-source: Generate tarball reproducibly.
* Use signature from 15.7.
* amd-libopencl1: Now supports OpenCL 2.1, too.
+ * Drop patches 04-3.17rc6-no_hotplug, 05-4.0.0-build, 07-4.1.0-build,
+ 08-4.2.0-build, 09-4.2.0-build.fpregs_active, 11-4.1.0-gpl-only: fixed
+ upstream.
+ * Disable patch 10-4.2.0-build.copy_xregs_to_kernel: seems to be no longer
+ neccessary.
-- Andreas Beckmann <anbe at debian.org> Sat, 16 Jan 2016 02:04:51 +0100
Deleted: fglrx-driver/branches/15.12/debian/patches/04-3.17rc6-no_hotplug.patch
===================================================================
--- fglrx-driver/branches/15.12/debian/patches/04-3.17rc6-no_hotplug.patch 2016-01-16 04:01:28 UTC (rev 1573)
+++ fglrx-driver/branches/15.12/debian/patches/04-3.17rc6-no_hotplug.patch 2016-01-17 22:19:24 UTC (rev 1574)
@@ -1,31 +0,0 @@
-# Fix building with Linux 3.17.
-
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-09 00:57:14.000000000 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:39:09.390175314 +0200
-@@ -1112,6 +1112,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 -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-09 00:57:14.000000000 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-27 10:39:09.390175314 +0200
-@@ -847,10 +847,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;
Deleted: fglrx-driver/branches/15.12/debian/patches/05-4.0.0-build.patch
===================================================================
--- fglrx-driver/branches/15.12/debian/patches/05-4.0.0-build.patch 2016-01-16 04:01:28 UTC (rev 1573)
+++ fglrx-driver/branches/15.12/debian/patches/05-4.0.0-build.patch 2016-01-17 22:19:24 UTC (rev 1574)
@@ -1,33 +0,0 @@
-# Patch to fix FTBFS with Linux 4.0.0.
-# Thanks to Michael Rasmussen <mir at datanom.net>.
-# Closes: #785150
-
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:44:41.292458241 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:43:51.189345210 +0200
-@@ -285,6 +285,11 @@
-
- MODULE_INFO(supported, "external");
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
-+#define read_cr4() __read_cr4()
-+#define write_cr4(cr4) __write_cr4(cr4)
-+#endif
-+
- /* globals constants */
- const char* KCL_SYSINFO_OsVersionString = UTS_RELEASE;
- const unsigned int KCL_SYSINFO_PageSize = PAGE_SIZE;
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/kcl_str.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/kcl_str.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/kcl_str.c 2015-09-09 00:57:14.000000000 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/kcl_str.c 2015-09-27 10:43:51.189345210 +0200
-@@ -42,6 +42,10 @@
- #include "kcl_type.h"
- #include "kcl_str.h"
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
-+#define strnicmp strncasecmp
-+#endif
-+
- /** \brief Fill memory with a constant byte
- * \param s Pointer to memory
- * \param c Initializing value
Deleted: fglrx-driver/branches/15.12/debian/patches/07-4.1.0-build.patch
===================================================================
--- fglrx-driver/branches/15.12/debian/patches/07-4.1.0-build.patch 2016-01-16 04:01:28 UTC (rev 1573)
+++ fglrx-driver/branches/15.12/debian/patches/07-4.1.0-build.patch 2016-01-17 22:19:24 UTC (rev 1574)
@@ -1,25 +0,0 @@
-From 94631bfd9b813d9d2f1af0ea744e7121d72d25c5 Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone at canonical.com>
-Date: Fri, 10 Jul 2015 16:52:29 +0200
-Subject: [PATCH 1/2] Add support for Linux 4.1
-
-Drop the IRQF_DISABLED flag, as it was removed in Linux 4.1
-
-Signed-off-by: Alberto Milone <alberto.milone at canonical.com>
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:45:53.915161112 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:51:18.421239216 +0200
-@@ -3511,10 +3511,12 @@
- KCL_PUB_InterruptHandlerWrap,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- ((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)),
--#else
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
- //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)),
-+#else
-+ ((useMSI) ? (0x0) : (IRQF_SHARED)),
- #endif
- dev_name,
- context);
Deleted: fglrx-driver/branches/15.12/debian/patches/08-4.2.0-build.patch
===================================================================
--- fglrx-driver/branches/15.12/debian/patches/08-4.2.0-build.patch 2016-01-16 04:01:28 UTC (rev 1573)
+++ fglrx-driver/branches/15.12/debian/patches/08-4.2.0-build.patch 2016-01-17 22:19:24 UTC (rev 1574)
@@ -1,110 +0,0 @@
-From eb7beb0ea51de526e59a0c3edc76530b28ef10e7 Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone at canonical.com>
-Date: Tue, 14 Jul 2015 12:56:37 +0200
-Subject: [PATCH 1/1] Add support for Linux 4.2
-
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:54:11.858303746 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:57:09.055500917 +0200
-@@ -191,9 +191,17 @@
- #include <linux/string.h>
- #include <linux/gfp.h>
- #include <linux/swap.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- #include "asm/i387.h"
-+#else
-+#include <asm/fpu/api.h>
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- #include <asm/fpu-internal.h>
-+#else
-+#include <asm/fpu/internal.h>
-+#endif
- #endif
-
- #include "firegl_public.h"
-@@ -1714,6 +1722,9 @@
-
- #if defined(__i386__)
- #ifndef __HAVE_ARCH_CMPXCHG
-+#ifndef __xg
-+#define __xg(x) ((volatile long *)(x))
-+#endif
- static inline
- unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old,
- unsigned long new, int size)
-@@ -1750,7 +1761,11 @@
- unsigned long new, int size)
- {
- #ifndef __HAVE_ARCH_CMPXCHG
-+#if defined(__i386__)
- return __fgl_cmpxchg(ptr,old,new,size);
-+#elif defined(__x86_64__)
-+ return cmpxchg((unsigned long*)ptr,old,new);
-+#endif
- #else
- /* On kernel version 2.6.34 passing a variable or unsupported size
- * argument to the __cmpxchg macro causes the default-clause of a
-@@ -6446,21 +6461,36 @@
- struct fpu *fpu = &tsk->thread.fpu;
-
- if(static_cpu_has(X86_FEATURE_XSAVE)) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- fpu_xsave(fpu);
- 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))
-+#endif
- return 1;
- } else if (static_cpu_has(X86_FEATURE_FXSR)) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- fpu_fxsave(fpu);
-+#else
-+ copy_fxregs_to_kernel(fpu);
-+#endif
- } else {
- asm volatile("fnsave %[fx]; fwait"
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- : [fx] "=m" (fpu->state->fsave));
-+#else
-+ : [fx] "=m" (fpu->state.fsave));
-+#endif
- return 0;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- if (unlikely(fpu->state->fxsave.swd & X87_FSW_ES)) {
- asm volatile("fnclex");
- return 0;
- }
-+#endif
- return 1;
- }
- #endif
-@@ -6472,8 +6502,12 @@
- void ATI_API_CALL KCL_fpu_begin(void)
- {
- #ifdef CONFIG_X86_64
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- kernel_fpu_begin();
- #else
-+ __kernel_fpu_begin();
-+#endif
-+#else
- #ifdef TS_USEDFPU
- struct thread_info *cur_thread = current_thread_info();
- struct task_struct *cur_task = get_current();
-@@ -6518,7 +6552,11 @@
- */
- void ATI_API_CALL KCL_fpu_end(void)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- kernel_fpu_end();
-+#else
-+ __kernel_fpu_end();
-+#endif
- }
-
- /** Create new directory entry under "/proc/...."
Deleted: fglrx-driver/branches/15.12/debian/patches/09-4.2.0-build.fpregs_active.patch
===================================================================
--- fglrx-driver/branches/15.12/debian/patches/09-4.2.0-build.fpregs_active.patch 2016-01-16 04:01:28 UTC (rev 1573)
+++ fglrx-driver/branches/15.12/debian/patches/09-4.2.0-build.fpregs_active.patch 2016-01-17 22:19:24 UTC (rev 1574)
@@ -1,17 +0,0 @@
-# Patch for 4.2 from Ubuntu.
-
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:58:15.146415639 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:58:35.682074723 +0200
-@@ -6531,7 +6531,11 @@
- /* The thread structure is changed with the commit below for kernel 3.3:
- * https://github.com/torvalds/linux/commit/7e16838d94b566a17b65231073d179bc04d590c8
- */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
-+ if (cur_task->thread.fpu.fpregs_active)
-+#else
- if (cur_task->thread.fpu.has_fpu)
-+#endif
- #else
- if (cur_task->thread.has_fpu)
- #endif
Deleted: fglrx-driver/branches/15.12/debian/patches/11-4.1.0-gpl-only.patch
===================================================================
--- fglrx-driver/branches/15.12/debian/patches/11-4.1.0-gpl-only.patch 2016-01-16 04:01:28 UTC (rev 1573)
+++ fglrx-driver/branches/15.12/debian/patches/11-4.1.0-gpl-only.patch 2016-01-17 22:19:24 UTC (rev 1574)
@@ -1,19 +0,0 @@
-# Do not use pci_ignore_hotplug which is GPL only.
-
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 11:05:14.583194764 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 11:03:27.257085053 +0200
-@@ -1125,7 +1125,12 @@
- // 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)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
-+ if(pdev)
-+ {
-+ pdev->ignore_hotplug = 1;
-+ }
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
- pci_ignore_hotplug(pdev);
- #endif
- PMSG_EVENT(pdev->dev.power.power_state) = state;
Modified: fglrx-driver/branches/15.12/debian/patches/series
===================================================================
--- fglrx-driver/branches/15.12/debian/patches/series 2016-01-16 04:01:28 UTC (rev 1573)
+++ fglrx-driver/branches/15.12/debian/patches/series 2016-01-17 22:19:24 UTC (rev 1574)
@@ -1,13 +1,7 @@
01-dkms-arch_compat.patch
02-authatieventsd.sh.patch
03-stub-for-agpless-kernel.patch
-04-3.17rc6-no_hotplug.patch
-05-4.0.0-build.patch
06-spelling-error-manpage.patch
-07-4.1.0-build.patch
-08-4.2.0-build.patch
-09-4.2.0-build.fpregs_active.patch
-10-4.2.0-build.copy_xregs_to_kernel.patch
-11-4.1.0-gpl-only.patch
+#10-4.2.0-build.copy_xregs_to_kernel.patch
12-4.3.0-build.patch
13-4.4.0-build.patch
More information about the Pkg-fglrx-devel
mailing list