package/amd-catalyst: remove package
Current X.org X server is incompatible with this driver. We no longer support unmaintainted versions of X.org X server. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
parent
6b2355fef0
commit
10097869d6
@ -146,6 +146,12 @@ endif
|
||||
|
||||
comment "Legacy options removed in 2020.11"
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST
|
||||
bool "amd-catalyst"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
Current X.org server is incompatible with this driver.
|
||||
|
||||
config BR2_PACKAGE_NVIDIA_TEGRA23
|
||||
bool "nvidia-tegra23 package removed"
|
||||
select BR2_LEGACY
|
||||
|
@ -417,7 +417,6 @@ endmenu
|
||||
source "package/acpitool/Config.in"
|
||||
source "package/aer-inject/Config.in"
|
||||
source "package/am335x-pru-package/Config.in"
|
||||
source "package/amd-catalyst/Config.in"
|
||||
source "package/apcupsd/Config.in"
|
||||
source "package/avrdude/Config.in"
|
||||
source "package/bcache-tools/Config.in"
|
||||
|
@ -1,45 +0,0 @@
|
||||
From c35482bc0cc56b40263b74c3e58e42be867fd9f2 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Thu, 17 Sep 2015 15:41:46 +0200
|
||||
Subject: [PATCH] Add support for Linux 4.0
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 5 +++++
|
||||
common/lib/modules/fglrx/build_mod/kcl_str.c | 4 ++++
|
||||
2 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 677565d..6017e89 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -285,6 +285,11 @@ MODULE_DEVICE_TABLE(pci, fglrx_pci_table);
|
||||
|
||||
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 --git a/common/lib/modules/fglrx/build_mod/kcl_str.c b/common/lib/modules/fglrx/build_mod/kcl_str.c
|
||||
index 2d89eb0..bacdb69 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/kcl_str.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/kcl_str.c
|
||||
@@ -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
|
||||
--
|
||||
2.8.1
|
||||
|
@ -1,31 +0,0 @@
|
||||
From e9c8ccb4c8c842042542b792c51f9a7ec6c85e06 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Thu, 17 Sep 2015 15:44:59 +0200
|
||||
Subject: [PATCH] Add support for Linux 4.1
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 4 +++-
|
||||
1 file changed, 3 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 6017e89..94778f1 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -3508,10 +3508,12 @@ int ATI_API_CALL KCL_InstallInterruptHandler(
|
||||
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);
|
||||
--
|
||||
2.8.1
|
||||
|
@ -1,121 +0,0 @@
|
||||
From e2e6c2dac2a0311a022208dd289374b832538329 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Tue, 14 Jul 2015 12:56:37 +0200
|
||||
Subject: [PATCH] Add support for Linux 4.2
|
||||
|
||||
Deal with the FPU code renaming
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 38 ++++++++++++++++++++++
|
||||
1 file changed, 38 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 94778f1..749ea51 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -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"
|
||||
@@ -1711,6 +1719,9 @@ void ATI_API_CALL KCL_SetCurrentProcessState(KCL_ENUM_ProcessState state)
|
||||
|
||||
#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)
|
||||
@@ -1747,7 +1758,11 @@ unsigned long ATI_API_CALL kcl__cmpxchg(volatile void *ptr, unsigned long old,
|
||||
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
|
||||
@@ -6443,21 +6458,36 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
|
||||
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
|
||||
@@ -6469,8 +6499,12 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
|
||||
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();
|
||||
@@ -6515,7 +6549,11 @@ void ATI_API_CALL KCL_fpu_begin(void)
|
||||
*/
|
||||
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/...."
|
||||
--
|
||||
2.8.1
|
||||
|
@ -1,33 +0,0 @@
|
||||
From 7120f00015570a2e4d9b6532731960d509c71cba Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Thu, 17 Sep 2015 15:48:30 +0200
|
||||
Subject: [PATCH] Use fpregs_active instead of has_fpu
|
||||
|
||||
This is for Linux 4.2
|
||||
|
||||
Thanks to Tim Gardner for the patch.
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 749ea51..4c1f9a5 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -6528,7 +6528,11 @@ void ATI_API_CALL KCL_fpu_begin(void)
|
||||
/* 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
|
||||
--
|
||||
2.8.1
|
||||
|
@ -1,79 +0,0 @@
|
||||
From eb703737be5c91c1a0817351db8ec152c523c85d Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Thu, 17 Sep 2015 15:49:46 +0200
|
||||
Subject: [PATCH] Use a local copy of copy_xregs_to_kernel
|
||||
|
||||
This is needed for Linux 4.2.
|
||||
|
||||
Thanks to Tim Gardner for the patch.
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 44 +++++++++++++++++++++-
|
||||
1 file changed, 43 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 4c1f9a5..bb67bba 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -6443,6 +6443,48 @@ int ATI_API_CALL kcl_sscanf(const char * buf, const char * fmt, ...)
|
||||
return i;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
|
||||
+/*
|
||||
+ * Save processor xstate to xsave area.
|
||||
+ */
|
||||
+static void _copy_xregs_to_kernel(struct xregs_state *xstate)
|
||||
+{
|
||||
+ u64 mask = -1;
|
||||
+ u32 lmask = mask;
|
||||
+ u32 hmask = mask >> 32;
|
||||
+ int err = 0;
|
||||
+
|
||||
+ /*WARN_ON(!alternatives_patched);*/
|
||||
+
|
||||
+ /*
|
||||
+ * If xsaves is enabled, xsaves replaces xsaveopt because
|
||||
+ * it supports compact format and supervisor states in addition to
|
||||
+ * modified optimization in xsaveopt.
|
||||
+ *
|
||||
+ * Otherwise, if xsaveopt is enabled, xsaveopt replaces xsave
|
||||
+ * because xsaveopt supports modified optimization which is not
|
||||
+ * supported by xsave.
|
||||
+ *
|
||||
+ * If none of xsaves and xsaveopt is enabled, use xsave.
|
||||
+ */
|
||||
+ alternative_input_2(
|
||||
+ "1:"XSAVE,
|
||||
+ XSAVEOPT,
|
||||
+ X86_FEATURE_XSAVEOPT,
|
||||
+ XSAVES,
|
||||
+ X86_FEATURE_XSAVES,
|
||||
+ [xstate] "D" (xstate), "a" (lmask), "d" (hmask) :
|
||||
+ "memory");
|
||||
+ asm volatile("2:\n\t"
|
||||
+ xstate_fault(err)
|
||||
+ : "0" (err)
|
||||
+ : "memory");
|
||||
+
|
||||
+ /* We should never fault when copying to a kernel buffer: */
|
||||
+ WARN_ON_FPU(err);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/** \brief Generate UUID
|
||||
* \param buf pointer to the generated UUID
|
||||
* \return None
|
||||
@@ -6462,7 +6504,7 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
|
||||
fpu_xsave(fpu);
|
||||
if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
|
||||
#else
|
||||
- copy_xregs_to_kernel(&fpu->state.xsave);
|
||||
+ _copy_xregs_to_kernel(&fpu->state.xsave);
|
||||
if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
|
||||
#endif
|
||||
return 1;
|
||||
--
|
||||
2.8.1
|
||||
|
@ -1,78 +0,0 @@
|
||||
From 54b230e26a1889c08507e791ab043f8a4b4ff771 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Perier <romain.perier@free-electrons.com>
|
||||
Date: Thu, 7 Jul 2016 14:40:53 +0200
|
||||
Subject: [PATCH] Add support for Linux 4.4
|
||||
|
||||
It fixes various things like the use of seq_printf because its API
|
||||
changed. It also replaces the call to mtrr_add and mtrr_del by
|
||||
arch_phys_wc_add and arch_phys_wc_del because these symbols are
|
||||
no longer exported for Linux >= 4.3.x.
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 21 +++++++++++++++++++++
|
||||
1 file changed, 21 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index bb67bba..b4b2d30 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -636,9 +636,16 @@ static int firegl_major_proc_read(struct seq_file *m, void* data)
|
||||
|
||||
len = snprintf(buf, request, "%d\n", major);
|
||||
#else
|
||||
+
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
|
||||
+ seq_printf(m, "%d\n", major);
|
||||
+ len = 0;
|
||||
+#else
|
||||
len = seq_printf(m, "%d\n", major);
|
||||
#endif
|
||||
|
||||
+#endif
|
||||
+
|
||||
KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len);
|
||||
|
||||
return len;
|
||||
@@ -3432,7 +3439,11 @@ int ATI_API_CALL KCL_MEM_MTRR_Support(void)
|
||||
int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size)
|
||||
{
|
||||
#ifdef CONFIG_MTRR
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
|
||||
+ return arch_phys_wc_add(base, size);
|
||||
+#else
|
||||
return mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1);
|
||||
+#endif
|
||||
#else /* !CONFIG_MTRR */
|
||||
return -EPERM;
|
||||
#endif /* !CONFIG_MTRR */
|
||||
@@ -3441,7 +3452,12 @@ int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size
|
||||
int ATI_API_CALL KCL_MEM_MTRR_DeleteRegion(int reg, unsigned long base, unsigned long size)
|
||||
{
|
||||
#ifdef CONFIG_MTRR
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
|
||||
+ arch_phys_wc_del(reg);
|
||||
+ return 0;
|
||||
+#else
|
||||
return mtrr_del(reg, base, size);
|
||||
+#endif
|
||||
#else /* !CONFIG_MTRR */
|
||||
return -EPERM;
|
||||
#endif /* !CONFIG_MTRR */
|
||||
@@ -6505,8 +6521,13 @@ 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 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)) {
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
--
|
||||
2.8.1
|
||||
|
@ -1,54 +0,0 @@
|
||||
Author: Manuel Rüger <mrueg@gentoo.org>
|
||||
Date: Sat, 2 Jan 2016 17:24:30 +0100
|
||||
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/x11-drivers/ati-drivers/files?id=179aa11ed2f1bd79cf1b190263c3a7a07279fc50
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:02.000000000 -0400
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:11.000000000 -0400
|
||||
@@ -136,7 +136,6 @@
|
||||
#include <asm/mman.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/processor.h>
|
||||
-#include <asm/tlbflush.h> // for flush_tlb_page
|
||||
#include <asm/cpufeature.h>
|
||||
#ifdef CONFIG_MTRR
|
||||
#include <asm/mtrr.h>
|
||||
@@ -251,6 +250,26 @@
|
||||
#define WRITE_CR4(x) write_cr4(x)
|
||||
#endif
|
||||
|
||||
+#define __flush_tlb_one(addr) asm volatile("invlpg (%0)" ::"r" (addr) : "memory")
|
||||
+#define __flush_tlb() native_write_cr3(native_read_cr3())
|
||||
+
|
||||
+static inline void __flush_tlb_all(void)
|
||||
+{
|
||||
+ if (cpu_has_pge)
|
||||
+ {
|
||||
+ unsigned long flags, cr4;
|
||||
+ raw_local_irq_save(flags);
|
||||
+ cr4 = native_read_cr4();
|
||||
+ native_write_cr4(cr4 & ~X86_CR4_PGE);
|
||||
+ native_write_cr4(cr4);
|
||||
+ raw_local_irq_restore(flags);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ __flush_tlb();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
// ============================================================
|
||||
/* globals */
|
||||
|
||||
--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:35.000000000 -0400
|
||||
+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:48.000000000 -0400
|
||||
@@ -868,7 +868,7 @@ void ATI_API_CALL KCL_ACPI_No_Hotplug(vo
|
||||
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
|
||||
if(pdev)
|
||||
{
|
||||
-#if (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8))
|
||||
+#if 0 && (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8))
|
||||
pci_ignore_hotplug(pdev);
|
||||
#else
|
||||
pdev->ignore_hotplug = 1;
|
@ -1,4 +0,0 @@
|
||||
Section "Device"
|
||||
Identifier "AMD Radeon GPU"
|
||||
Driver "fglrx"
|
||||
EndSection
|
@ -1,65 +0,0 @@
|
||||
comment "amd-catalyst needs a glibc toolchain"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST
|
||||
bool "amd-catalyst"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
help
|
||||
The binary-only driver blob for AMD cards.
|
||||
This driver supports AMD Radeon HD 5xxx and newer graphics
|
||||
cards.
|
||||
|
||||
http://www.amd.com/
|
||||
|
||||
if BR2_PACKAGE_AMD_CATALYST
|
||||
|
||||
comment "amd-catalyst X.org drivers needs a modular Xorg server <= 1.17"
|
||||
depends on !BR2_PACKAGE_XORG7 \
|
||||
|| !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR \
|
||||
|| !BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_XORG
|
||||
bool "X.org drivers"
|
||||
default y
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
|
||||
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
|
||||
select BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX
|
||||
select BR2_PACKAGE_ACPID # runtime
|
||||
select BR2_PACKAGE_XLIB_LIBX11 # runtime
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT # runtime
|
||||
select BR2_PACKAGE_XLIB_LIBXCOMPOSITE # runtime
|
||||
# This package does not have standard GL headers
|
||||
select BR2_PACKAGE_MESA3D_HEADERS
|
||||
select BR2_PACKAGE_HAS_LIBGL
|
||||
|
||||
if BR2_PACKAGE_AMD_CATALYST_XORG
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LIBGL
|
||||
default "amd-catalyst"
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS
|
||||
bool "command-line configuration tools"
|
||||
help
|
||||
Build and install the AMD command line tools.
|
||||
|
||||
endif
|
||||
|
||||
comment "amd-catalyst kernel module needs a kernel to be built"
|
||||
depends on !BR2_LINUX_KERNEL
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_MODULE
|
||||
bool "fglrx kernel module"
|
||||
depends on BR2_LINUX_KERNEL
|
||||
help
|
||||
Builds and install the fglrx kernel module
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_OPENCL
|
||||
bool "OpenCL support"
|
||||
help
|
||||
Installs the OpenCL binary blobs and the ICD profile
|
||||
for GPGPU computing.
|
||||
|
||||
endif # BR2_PACKAGE_AMD_CATALYST
|
@ -1,2 +0,0 @@
|
||||
# Locally computed
|
||||
sha256 bf3e6e7d5c51db3d075410a3f116f865b82823debc1d66698d187249feec6a91 amd-catalyst-15.9-linux-installer-15.201.1151-x86.x86_64.zip
|
@ -1,162 +0,0 @@
|
||||
################################################################################
|
||||
#
|
||||
# amd-catalyst
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AMD_CATALYST_VERSION = 15.9
|
||||
AMD_CATALYST_VERBOSE_VER = 15.201.1151
|
||||
AMD_CATALYST_SITE = http://www2.ati.com/drivers/linux
|
||||
AMD_CATALYST_DL_OPTS = --referer='http://support.amd.com'
|
||||
AMD_CATALYST_SOURCE = amd-catalyst-$(AMD_CATALYST_VERSION)-linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.zip
|
||||
AMD_CATALYST_LICENSE = AMD Software License
|
||||
AMD_CATALYST_LICENSE_FILES = LICENSE.TXT
|
||||
AMD_CATALYST_INSTALL_STAGING = YES
|
||||
AMD_CATALYST_SUFFIX = $(if $(BR2_x86_64),_64)
|
||||
AMD_CATALYST_ARCH_DIR = $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)
|
||||
AMD_CATALYST_LIB_SUFFIX = $(if $(BR2_x86_64),64)
|
||||
|
||||
define AMD_CATALYST_EXTRACT_CMDS
|
||||
unzip -q $(AMD_CATALYST_DL_DIR)/$(AMD_CATALYST_SOURCE) -d $(@D)
|
||||
$(SHELL) $(@D)/AMD-Catalyst-$(AMD_CATALYST_VERSION)-Linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.run --extract $(@D)
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_MODULE),y)
|
||||
AMD_CATALYST_MODULE_SUBDIRS = common/lib/modules/fglrx/build_mod/2.6.x
|
||||
AMD_CATALYST_MODULE_MAKE_OPTS = \
|
||||
CFLAGS_MODULE="-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
|
||||
|
||||
define AMD_CATALYST_PREPARE_MODULE
|
||||
# The Makefile expects to have source in the folder 2.6.x
|
||||
cp $(@D)/common/lib/modules/fglrx/build_mod/*.{c,h} \
|
||||
$(@D)/common/lib/modules/fglrx/build_mod/2.6.x
|
||||
# This static lib is required during the link
|
||||
cp $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)/lib/modules/fglrx/build_mod/libfglrx_ip.a \
|
||||
$(@D)/common/lib/modules/fglrx/build_mod/2.6.x
|
||||
endef
|
||||
|
||||
AMD_CATALYST_POST_PATCH_HOOKS += AMD_CATALYST_PREPARE_MODULE
|
||||
|
||||
$(eval $(kernel-module))
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_OPENCL),y)
|
||||
|
||||
AMD_CATALYST_OCL_SUFFIX = $(if $(BR2_x86_64),64,32)
|
||||
AMD_CATALYST_OPENCL_FILES = \
|
||||
libOpenCL.so.1 \
|
||||
libaticalcl.so \
|
||||
libamdocl$(AMD_CATALYST_OCL_SUFFIX).so \
|
||||
libamdocl12cl$(AMD_CATALYST_OCL_SUFFIX).so
|
||||
|
||||
define AMD_CATALYST_INSTALL_OPENCL
|
||||
$(foreach f,$(AMD_CATALYST_OPENCL_FILES), \
|
||||
$(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/$(f) $(TARGET_DIR)/usr/lib/$(f)
|
||||
)
|
||||
ln -sf libOpenCL.so.1 \
|
||||
$(TARGET_DIR)/usr/lib/libOpenCL.so
|
||||
$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/bin/clinfo \
|
||||
$(TARGET_DIR)/usr/bin/clinfo
|
||||
$(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd \
|
||||
$(TARGET_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd
|
||||
endef
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_XORG), y)
|
||||
|
||||
# GL headers are needed by any package that wants to use libgl, so they need to
|
||||
# be installed before any user of it. The only way to do so is to have this
|
||||
# package depends on mesa3d-headers.
|
||||
AMD_CATALYST_DEPENDENCIES += mesa3d-headers
|
||||
AMD_CATALYST_PROVIDES = libgl
|
||||
AMD_CATALYST_X11R6_LIB = $(@D)/xpic$(if $(BR2_x86_64),_64a)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)
|
||||
|
||||
define AMD_CATALYST_INSTALL_GL_LIBS
|
||||
$(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/fglrx/fglrx-libGL.so.1.2 \
|
||||
$(1)/usr/lib
|
||||
ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1.2
|
||||
ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1
|
||||
ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so
|
||||
endef
|
||||
|
||||
define AMD_CATALYST_INSTALL_STAGING_XORG
|
||||
$(call AMD_CATALYST_INSTALL_GL_LIBS,$(STAGING_DIR))
|
||||
$(INSTALL) -D -m 0644 package/amd-catalyst/gl.pc \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/gl.pc
|
||||
endef
|
||||
|
||||
AMD_CATALYST_XORG_DRIVERS_FILES = modules/amdxmm.so \
|
||||
modules/drivers/fglrx_drv.so \
|
||||
modules/linux/libfglrxdrm.so
|
||||
|
||||
define AMD_CATALYST_INSTALL_XORG
|
||||
# Xorg drivers
|
||||
$(foreach f,$(AMD_CATALYST_XORG_DRIVERS_FILES), \
|
||||
$(INSTALL) -D -m 0755 $(AMD_CATALYST_X11R6_LIB)/$(f) \
|
||||
$(TARGET_DIR)/usr/lib/xorg/$(f)
|
||||
)
|
||||
|
||||
# Xorg is not able to detect the driver automatically
|
||||
$(INSTALL) -D -m 0644 package/amd-catalyst/20-fglrx.conf \
|
||||
$(TARGET_DIR)/etc/X11/xorg.conf.d/20-fglrx.conf
|
||||
|
||||
# Common files: containing binary profiles about GPUs,
|
||||
# required by the fglrx_drv xorg driver
|
||||
$(INSTALL) -d $(TARGET_DIR)/etc/ati
|
||||
$(INSTALL) -m 0644 $(@D)/common/etc/ati/* $(TARGET_DIR)/etc/ati/
|
||||
|
||||
# DRI and GLX xorg modules: by default DRI is activated,
|
||||
# these modules are required by the fglrx_drv.so xorg driver
|
||||
$(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/modules/dri/fglrx_dri.so \
|
||||
$(TARGET_DIR)/usr/lib/dri/fglrx_dri.so
|
||||
$(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/extensions/fglrx/fglrx-libglx.so \
|
||||
$(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so
|
||||
$(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/glesx.so \
|
||||
$(TARGET_DIR)/usr/lib/xorg/modules/glesx.so
|
||||
|
||||
# Userspace GL libraries, also runtime dependency of most of the cmdline
|
||||
# tools
|
||||
$(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/*.so \
|
||||
$(TARGET_DIR)/usr/lib/
|
||||
$(call AMD_CATALYST_INSTALL_GL_LIBS,$(TARGET_DIR))
|
||||
|
||||
# Runtime dependency required by libfglrxdrm.so
|
||||
$(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/libatiuki.so.1.0 \
|
||||
$(TARGET_DIR)/usr/lib/
|
||||
ln -sf libatiuki.so.1.0 \
|
||||
$(TARGET_DIR)/usr/lib/libatiuki.so.1
|
||||
endef
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS), y)
|
||||
AMD_CATALYST_CMDLINE_TOOLS_FILES = \
|
||||
atiode \
|
||||
atiodcli \
|
||||
fgl_glxgears \
|
||||
aticonfig \
|
||||
amd-console-helper \
|
||||
fglrxinfo
|
||||
|
||||
define AMD_CATALYST_INSTALL_CMDLINE_TOOLS
|
||||
$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/atieventsd \
|
||||
$(TARGET_DIR)/usr/sbin
|
||||
$(foreach f,$(AMD_CATALYST_CMDLINE_TOOLS_FILES), \
|
||||
$(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/$(f) \
|
||||
$(TARGET_DIR)/usr/bin/$(f)
|
||||
)
|
||||
endef
|
||||
endif
|
||||
|
||||
define AMD_CATALYST_INSTALL_STAGING_CMDS
|
||||
$(call AMD_CATALYST_INSTALL_STAGING_XORG)
|
||||
endef
|
||||
|
||||
define AMD_CATALYST_INSTALL_TARGET_CMDS
|
||||
$(call AMD_CATALYST_INSTALL_XORG)
|
||||
$(call AMD_CATALYST_INSTALL_CMDLINE_TOOLS)
|
||||
$(call AMD_CATALYST_INSTALL_OPENCL)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
@ -1,12 +0,0 @@
|
||||
prefix=/usr
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: gl
|
||||
Description: AMD Catalyst OpenGL library
|
||||
Version: 15.9
|
||||
Libs: -L${libdir} -lGL -lm -lXext -lX11 -ldl
|
||||
Cflags: -I${includedir}
|
||||
glx_tls: no
|
||||
|
Loading…
Reference in New Issue
Block a user