diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-08-24 08:06:32 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-08-24 08:06:32 +0000 |
| commit | b8b8446361fa464faa25bb00b8b6ec8ec86e5b10 (patch) | |
| tree | 5284b633b3270924fced02585a8f4f1d7f91ad77 /x11-drivers | |
| parent | Raise media-libs/tiff dependency to skip non-multilib -r4. (diff) | |
| download | gentoo-2-b8b8446361fa464faa25bb00b8b6ec8ec86e5b10.tar.gz gentoo-2-b8b8446361fa464faa25bb00b8b6ec8ec86e5b10.tar.bz2 gentoo-2-b8b8446361fa464faa25bb00b8b6ec8ec86e5b10.zip | |
Add patches that were mistakenly omitted.
(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-drivers')
4 files changed, 64 insertions, 1 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index f103ef6ffa0b..4fc3e6298767 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-drivers/ati-drivers # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.337 2013/08/23 18:15:21 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.338 2013/08/24 08:06:32 chithanh Exp $ + + 24 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/ati-drivers-13.8-beta-include-seq_file.patch, + +files/ati-drivers-13.8-proc-permissions.diff, + +files/check-for-iommu-only-if-iommu-is-supported.patch: + Add patches that were mistakenly omitted. *ati-drivers-13.8_beta2 (23 Aug 2013) diff --git a/x11-drivers/ati-drivers/files/ati-drivers-13.8-beta-include-seq_file.patch b/x11-drivers/ati-drivers/files/ati-drivers-13.8-beta-include-seq_file.patch new file mode 100644 index 000000000000..fb1ba17e0223 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-13.8-beta-include-seq_file.patch @@ -0,0 +1,13 @@ +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 22561c5..fdfe65e 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -520,6 +520,8 @@ static int func##_wrap(char *buf, char **start, kcl_off_t offset, \ + } + + #else ++#include <linux/seq_file.h> ++ + #define READ_PROC_WRAP(func) \ + static int func##_wrap(struct seq_file *m, void* data) \ + { \ diff --git a/x11-drivers/ati-drivers/files/ati-drivers-13.8-proc-permissions.diff b/x11-drivers/ati-drivers/files/ati-drivers-13.8-proc-permissions.diff new file mode 100644 index 000000000000..26015f41381f --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-13.8-proc-permissions.diff @@ -0,0 +1,13 @@ +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 22561c5..6480d1a 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -821,7 +821,7 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev, + 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_IFDIR); ++ root = KCL_create_proc_dir(NULL, "ati", S_IFDIR|S_IRUGO|S_IXUGO); + } + + if (!root) diff --git a/x11-drivers/ati-drivers/files/check-for-iommu-only-if-iommu-is-supported.patch b/x11-drivers/ati-drivers/files/check-for-iommu-only-if-iommu-is-supported.patch new file mode 100644 index 000000000000..7932487388f6 --- /dev/null +++ b/x11-drivers/ati-drivers/files/check-for-iommu-only-if-iommu-is-supported.patch @@ -0,0 +1,31 @@ +From 1633d55aa0fb9c2ceb0ae1eab15bdec5066d35ae Mon Sep 17 00:00:00 2001 +From: Emil Karlson <jekarlson@gmail.com> +Date: Fri, 2 Aug 2013 01:18:41 +0300 +Subject: [PATCH 1/3] Check for iommu only, if iommu is supported. + +--- + common/lib/modules/fglrx/build_mod/kcl_iommu.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/common/lib/modules/fglrx/build_mod/kcl_iommu.c b/common/lib/modules/fglrx/build_mod/kcl_iommu.c +index c6602dd..803455c 100755 +--- a/common/lib/modules/fglrx/build_mod/kcl_iommu.c ++++ b/common/lib/modules/fglrx/build_mod/kcl_iommu.c +@@ -183,11 +183,13 @@ void ATI_API_CALL KCL_IOMMU_UnbindPasid( KCL_PCI_DevHandle pcidev,int pasid) + */ + int ATI_API_CALL KCL_IOMMU_CheckInfo( KCL_PCI_DevHandle pcidev) + { ++#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_AMD_IOMMU) + struct pci_dev* pdev = (struct pci_dev*)pcidev; +- if ( pdev->dev.archdata.iommu ) ++ if ( pdev->dev.archdata.iommu ) + { + return 1; + } ++#endif + return 0; + } + +-- +1.8.1.5 + |