jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

catalyst: update to 15.20.1046.

Browse source
This commit is contained in:
Juan RP 2015-07-08 22:10:45 +02:00
parent 13d843c2eb
commit e9abd3ecbd
5 changed files with 5 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
srcpkgs/catalyst/files/atieventsd.service
View file

@ -1,9 +0,0 @@
[Unit]
Description=Catalyst event Daemon
Requires=acpid.socket
[Service]
ExecStart=/usr/sbin/atieventsd --nodaemon
[Install]
WantedBy=multi-user.target

29
srcpkgs/catalyst/files/fglrx_3.17rc6-no_hotplug.patch
View file

@ -1,29 +0,0 @@
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;

28
srcpkgs/catalyst/files/kolasa-3.19-get_cpu_var.patch
View file

@ -1,28 +0,0 @@
--- 14.12/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-12-11 00:15:11.000000000 +0100
+++ 14.12/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-01-01 21:39:40.471543282 +0100
@@ -4823,8 +4823,13 @@
{
unsigned long orig_level;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ orig_level = __this_cpu_read(kasExecutionLevel);
+ __this_cpu_write(kasExecutionLevel,level);
+#else
orig_level = __get_cpu_var(kasExecutionLevel);
__get_cpu_var(kasExecutionLevel) = level;
+#endif
return orig_level;
}
@@ -4836,7 +4841,11 @@
*/
static unsigned long kas_GetExecutionLevel(void)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
+ return __this_cpu_read(kasExecutionLevel);
+#else
return __get_cpu_var(kasExecutionLevel);
+#endif
}
/** \brief Type definition for kas_spin_lock() parameter */

50
srcpkgs/catalyst/files/lano1106_fglrx-13.8_proc.patch
View file

@ -1,50 +0,0 @@
--- 13.8/common/lib/modules/fglrx/build_mod/firegl_public.c 2013-09-26 00:59:28.292596334 -0400
+++ 13.8/common/lib/modules/fglrx/build_mod/firegl_public.c 2013-09-26 01:02:35.036252455 -0400
@@ -821,7 +821,7 @@ static struct proc_dir_entry *firegl_pro
KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list);
if (!minor)
{
- root = KCL_create_proc_dir(NULL, "ati", S_IRUGO|S_IXUGO);
+ root = KCL_create_proc_dir(NULL, "ati", 0);
}
if (!root)
@@ -835,7 +835,7 @@ static struct proc_dir_entry *firegl_pro
// Global major debice number entry and Global debug entry
while (globallist->rp || globallist->fops)
{
- ent = KCL_create_proc_entry(root, globallist->name, S_IFREG|S_IRUGO, globallist->fops, globallist->rp, globallist->wp, dev);
+ ent = KCL_create_proc_entry(root, globallist->name, 0, globallist->fops, globallist->rp, globallist->wp, dev);
if (!ent)
{
KCL_remove_proc_dir_entry(NULL, "ati");
@@ -847,7 +847,7 @@ static struct proc_dir_entry *firegl_pro
}
sprintf(name, "%d", minor);
- *dev_root = KCL_create_proc_dir(root, name, S_IRUGO|S_IXUGO);
+ *dev_root = KCL_create_proc_dir(root, name, 0);
if (!*dev_root) {
KCL_remove_proc_dir_entry(root, "major");
KCL_remove_proc_dir_entry(NULL, "ati");
@@ -857,7 +857,7 @@ static struct proc_dir_entry *firegl_pro
while (list->rp || list->fops)
{
- ent = KCL_create_proc_entry(*dev_root, list->name, S_IFREG|S_IRUGO, list->fops, list->rp, list->wp,
+ ent = KCL_create_proc_entry(*dev_root, list->name, 0, list->fops, list->rp, list->wp,
((dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev)));
if (!ent)
{
@@ -6358,9 +6358,9 @@ void * KCL_create_proc_dir(void *root_di
dir = create_proc_entry(name, S_IFDIR | access, (struct proc_dir_entry *)root_dir);
#else
if (root_dir == NULL)
- dir = proc_mkdir_mode(name, S_IFDIR | access, NULL);
+ dir = proc_mkdir_mode(name, access, NULL);
else
- dir = proc_mkdir_mode(name, S_IFDIR | access, (struct proc_dir_entry *)root_dir);
+ dir = proc_mkdir_mode(name, access, (struct proc_dir_entry *)root_dir);
#endif
return dir;

13
srcpkgs/catalyst/template
View file

@ -2,7 +2,7 @@
_desc="AMD catalyst driver for Linux"
pkgname=catalyst
version=15.5
version=15.20.1046
revision=1
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Propietary AMD license"
@ -12,15 +12,15 @@ only_for_archs="i686 x86_64"
hostmakedepends="unzip wget"
subpackages="${pkgname}-opencl ${pkgname}-dkms ${pkgname}-libs"
depends="${pkgname}-dkms-${version}_${revision}"
conflicts="nvidia>=0 xserver-abi-video>19"
conflicts="nvidia>=0"
short_desc="${_desc} - Utilities"
repository="nonfree"
create_wrksrc=yes
XBPS_FETCH_CMD="wget --referer='http://support.amd.com/en-us/download/desktop?os=Linux+x86' "
distfiles="http://www2.ati.com/drivers/linux/amd-catalyst-omega-${version}-linux-run-installers.zip"
checksum=1113f344fd6235dca66c2c039f7ce544e61f9957039ab8398d714713699bca92
distfiles="http://www2.ati.com/drivers/linux/amd-driver-installer-${version}-x86.x86_64.zip"
checksum=ffde64203f49d9288eaa25f4d744187b6f4f14a87a444bab6a001d822b327a9d
if [ "$XBPS_MACHINE" = "i686" ]; then
_ARCHDIR="x86"
@ -31,12 +31,9 @@ elif [ "$XBPS_MACHINE" = "x86_64" ]; then
fi
do_build() {
/bin/sh ./amd-catalyst-omega-${version}-linux-run-installers.run --extract fglrx-${version}
/bin/sh ./amd-driver-installer-${version}-x86.x86_64.run --extract fglrx-${version}
cd fglrx-${version}
patch -Np1 -i ${FILESDIR}/fglrx_3.17rc6-no_hotplug.patch
patch -Np1 -i ${FILESDIR}/lano1106_fglrx-13.8_proc.patch
patch -Np1 -i ${FILESDIR}/kolasa-3.19-get_cpu_var.patch
patch -Np1 -i ${FILESDIR}/kolasa_4.0-cr4-strn.patch
}
do_install() {