diff --git a/packages/x11/driver/xf86-video-fglrx/build b/packages/x11/driver/xf86-video-fglrx/build index 3f8198591e..73141c114a 100755 --- a/packages/x11/driver/xf86-video-fglrx/build +++ b/packages/x11/driver/xf86-video-fglrx/build @@ -47,7 +47,8 @@ cd $ROOT/$PKG_BUILD mkdir -p $INSTALL_DIR/etc/ati cp common/etc/ati/amdpcsdb.default $INSTALL_DIR/etc/ati cp common/etc/ati/control $INSTALL_DIR/etc/ati - cp common/etc/ati/signature $INSTALL_DIR/etc/ati + #cp common/etc/ati/signature $INSTALL_DIR/etc/ati + echo "b707d1012f4412b1c0f865b95bee38e0:8e29e1311d692383f0c1578136c309d48f32e6326c6953e589d85d8b6edb0ad0:8f62e3384a752180f19c538069dd00d3d137b2301a732a80f3ce068a6bd75cd48f61e2334a722183f69b53806edd5dd58f3eb5391a202ad3f69d01db6b8f5cd0" > $INSTALL_DIR/etc/ati/signature ln -sf /storage/.config/fglrx.conf $INSTALL_DIR/etc/ati/amdpcsdb ( diff --git a/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb b/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb index 78f3aa06da..0ba5ce60b3 100644 --- a/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb +++ b/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb @@ -2,7 +2,6 @@ AMDPCSDBV1 [AMDPCSROOT/SYSTEM/MCIL] DigitalHDTVDefaultUnderscan=V0 UvdEnabled=V1 -HWUVD_H264Level51Support=V1 [AMDPCSROOT/SYSTEM/DDX] diff --git a/packages/x11/driver/xf86-video-fglrx/meta b/packages/x11/driver/xf86-video-fglrx/meta index 653a3c6be4..fe414e2ebd 100644 --- a/packages/x11/driver/xf86-video-fglrx/meta +++ b/packages/x11/driver/xf86-video-fglrx/meta @@ -17,14 +17,15 @@ # the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. # http://www.gnu.org/copyleft/gpl.html ################################################################################ - +#http://www2.ati.com/drivers/beta/amd-driver-installer-catalyst-13-6-beta-x86.x86_64.zip PKG_NAME="xf86-video-fglrx" -PKG_VERSION="12.10" +PKG_VERSION="13-6" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.ati.com/" -PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-$PKG_VERSION-x86.x86_64.zip" +#PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-$PKG_VERSION-x86.x86_64.zip" +PKG_URL="http://www2.ati.com/drivers/beta/amd-driver-installer-catalyst-$PKG_VERSION-beta-x86.x86_64.zip" PKG_DEPENDS="linux libX11 libXinerama libXcomposite" PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite linux" PKG_PRIORITY="optional" diff --git a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.7.patch b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.7.patch deleted file mode 100644 index 47cd425aa5..0000000000 --- a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.7.patch +++ /dev/null @@ -1,132 +0,0 @@ ---- 12.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-09-26 15:04:28.000000000 +0200 -+++ 12.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-10-16 20:30:42.146523753 +0200 -@@ -3892,7 +3892,11 @@ - KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); - return -EAGAIN; - } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_ops; - break; - -@@ -3922,14 +3926,22 @@ - KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); - return -EAGAIN; - } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_ops; - } - break; - #endif - - case __KE_SHM: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_shm_ops; - break; - -@@ -3937,7 +3949,11 @@ - - pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; -+#else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - - //vma->vm_flags |= VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */ - //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ -@@ -3946,14 +3962,22 @@ - - case __KE_CTX: - pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ - vma->vm_ops = &vm_ctx_ops; - break; - - case __KE_PCI_BQS: - pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ - vma->vm_ops = &vm_pci_bq_ops; - break; -@@ -3984,9 +4008,17 @@ - return -EAGAIN; - } - #ifdef __x86_64__ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; - #else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - #endif - vma->vm_ops = &vm_ops; - } -@@ -4015,9 +4047,17 @@ - return -EAGAIN; - } - #ifdef __x86_64__ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; - #else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - #endif - vma->vm_ops = &vm_agp_bq_ops; - } -@@ -4025,7 +4065,11 @@ - #endif /* __AGP__BUILTIN__ */ - - case __KE_KMAP: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_kmap_ops; - if (readonly && (vma->vm_flags & VM_WRITE)) - { -@@ -4046,7 +4090,11 @@ - #endif - // fall through - case __KE_GART_CACHEABLE: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; -+#else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_gart_ops; - break; - default: diff --git a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.8.patch b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.8.patch deleted file mode 100644 index ad2f3f18cf..0000000000 --- a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.8.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 12.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2012-10-23 22:44:52.000000000 +0200 -+++ 12.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2012-12-22 22:11:30.289750331 +0100 -@@ -775,7 +775,9 @@ - unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo) - { - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) -- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) -+ pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle; -+ #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) - pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle; - #else - pInfo->video_handle = pInfo->pcidev->dev.firmware_data; diff --git a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-remove-overlapping-pci-ids.patch b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-remove-overlapping-pci-ids.patch deleted file mode 100644 index cb6d32642f..0000000000 --- a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-remove-overlapping-pci-ids.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h b/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h -index b358d0b..d45a78a 100755 ---- a/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h -+++ b/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h -@@ -97,7 +97,6 @@ - FGL_ASIC_ID(0x677B), - FGL_ASIC_ID(0x6772), - FGL_ASIC_ID(0x6779), -- FGL_ASIC_ID(0x6770), - FGL_ASIC_ID(0x671F), - FGL_ASIC_ID(0x6718), - FGL_ASIC_ID(0x6719), -@@ -147,7 +146,6 @@ - FGL_ASIC_ID(0x68D1), - FGL_ASIC_ID(0x68C7), - FGL_ASIC_ID(0x68E0), -- FGL_ASIC_ID(0x68E1), - FGL_ASIC_ID(0x68F0), - FGL_ASIC_ID(0x68F1), - FGL_ASIC_ID(0x68E4), diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index 64b6913fa9..88fdc8ef7b 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -260,7 +260,7 @@ # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware) # Space separated list is supported, # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" - GRAPHIC_DRIVERS="fglrx-legacy" + GRAPHIC_DRIVERS="fglrx" # XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3) XBMCPLAYER_DRIVER="default"