diff options
Diffstat (limited to 'community-testing/catalyst-dkms')
-rw-r--r-- | community-testing/catalyst-dkms/3.5-do_mmap.patch | 50 | ||||
-rw-r--r-- | community-testing/catalyst-dkms/PKGBUILD | 50 | ||||
-rw-r--r-- | community-testing/catalyst-dkms/catalyst.install | 18 | ||||
-rw-r--r-- | community-testing/catalyst-dkms/dkms.conf | 7 |
4 files changed, 0 insertions, 125 deletions
diff --git a/community-testing/catalyst-dkms/3.5-do_mmap.patch b/community-testing/catalyst-dkms/3.5-do_mmap.patch deleted file mode 100644 index 04248eb7b..000000000 --- a/community-testing/catalyst-dkms/3.5-do_mmap.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200 -@@ -2106,6 +2106,12 @@ - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) -+# define NO_DO_MMAP -+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f) -+# define do_munmap(a,b,c) vm_munmap(b, c) -+#endif -+ - unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval( - KCL_IO_FILE_Handle file, - unsigned long addr, -@@ -2117,10 +2123,13 @@ - - flags = MAP_SHARED; - prot = PROT_READ|PROT_WRITE; -- -+#ifdef NO_DO_MMAP -+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff); -+#else - down_write(¤t->mm->mmap_sem); - vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff); - up_write(¤t->mm->mmap_sem); -+#endif - if (IS_ERR(vaddr)) - return 0; - else -@@ -2131,7 +2140,9 @@ - { - int retcode = 0; - -+#ifndef NO_DO_MMAP - down_write(¤t->mm->mmap_sem); -+#endif - #ifdef FGL_LINUX_RHEL_MUNMAP_API - retcode = do_munmap(current->mm, - addr, -@@ -2142,7 +2153,9 @@ - addr, - len); - #endif -+#ifndef NO_DO_MMAP - up_write(¤t->mm->mmap_sem); -+#endif - return retcode; - } - diff --git a/community-testing/catalyst-dkms/PKGBUILD b/community-testing/catalyst-dkms/PKGBUILD deleted file mode 100644 index 05e501cda..000000000 --- a/community-testing/catalyst-dkms/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 78743 2012-10-23 22:15:52Z lcarlier $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero -# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert - -pkgname=catalyst-dkms -pkgver=12.10 -pkgrel=1 -pkgdesc="AMD proprietary gpu kernel driver" -arch=('i686' 'x86_64') -url="http://www.amd.com" -license=('custom') -depends=('dkms') -optdepends=('linux-headers: build the module against Arch kernel' - 'linux-lts-headers: build the module against LTS Arch kernel') -replaces=('catalyst-lts-dkms') # useless -source=(http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${pkgver}-x86.x86_64.zip - dkms.conf) -md5sums=('ef6ecd984e47e80849215b33fbfa5b7f' - '972049dc247a74a7162f2227078abcb0') -install=catalyst.install - -package() { - depends=(${depends[@]} "catalyst-utils=${pkgver}") - - cd ${srcdir} - - if [ "${CARCH}" = "x86_64" ]; then - _archdir=x86_64 - else - _archdir=x86 - fi - - sh ./amd-driver-installer*.run --extract fglrx-install - - cd fglrx-install - #patch -Np1 -i ../3.5-do_mmap.patch - - install -dm755 "${pkgdir}/usr/lib/modprobe.d" - install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}" - cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" - cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" - cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" - sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf" - - echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf" - - # license - install -Dm644 "common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" -} diff --git a/community-testing/catalyst-dkms/catalyst.install b/community-testing/catalyst-dkms/catalyst.install deleted file mode 100644 index 655468646..000000000 --- a/community-testing/catalyst-dkms/catalyst.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - dkms install -m fglrx -v $1 -} - -pre_upgrade() { - local curver=$2 - # $2 is unset due to a bug. Query current version using pacman as fallback - [ -n "$curver" ] || curver=$(pacman -Qi catalyst-dkms | awk '/^Version/{print $3}') - pre_remove $curver -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - dkms remove -m fglrx -v $1 --all -} diff --git a/community-testing/catalyst-dkms/dkms.conf b/community-testing/catalyst-dkms/dkms.conf deleted file mode 100644 index 8d312da4f..000000000 --- a/community-testing/catalyst-dkms/dkms.conf +++ /dev/null @@ -1,7 +0,0 @@ -PACKAGE_NAME="fglrx" -PACKAGE_VERSION="@VERSION@" -CLEAN="rm -f *.*o" -BUILT_MODULE_NAME[0]="fglrx" -MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck" -DEST_MODULE_LOCATION[0]="/extramodules" -AUTOINSTALL="yes" |