summaryrefslogtreecommitdiff
path: root/x11-apps/intel-gpu-tools/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-apps/intel-gpu-tools/files')
-rw-r--r--x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch28
-rw-r--r--x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch35
-rw-r--r--x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch53
3 files changed, 53 insertions, 63 deletions
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch
deleted file mode 100644
index 02a97c48d121..000000000000
--- a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/582430
-
-From d24f4a5c5fe45e2fad8942acc137f87cd8f35ea5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 14:37:38 -0400
-Subject: [PATCH] include inttypes.h for PRI defines
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96620
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/igt_fb.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/igt_fb.c b/lib/igt_fb.c
-index 61205f345707..ba29eae5cabd 100644
---- a/lib/igt_fb.c
-+++ b/lib/igt_fb.c
-@@ -28,6 +28,7 @@
- #define _GNU_SOURCE
- #include <stdio.h>
- #include <math.h>
-+#include <inttypes.h>
-
- #include "drmtest.h"
- #include "igt_fb.h"
---
-2.8.2
-
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch
deleted file mode 100644
index c805c120f552..000000000000
--- a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/581080
-
-From 3e8cc82d371b23303cd4f30e4bcc9c5ecb10ad11 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 14:24:42 -0400
-Subject: [PATCH] pull in headers for major/minor/makedev funcs
-
-Use the portable autoconf helper to figure out which header to include
-for these funcs. Linux C libs are moving to not implicitly include them
-via sys/types.h anymore, and other OS's have long required you to pull
-in the right header directly.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96618
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac | 1 +
- lib/igt_sysfs.c | 9 +++++++++
- tools/aubdump.c | 8 +++++++-
- 3 files changed, 17 insertions(+), 1 deletion(-)
-
---- a/tools/aubdump.c
-+++ b/tools/aubdump.c
-@@ -38,6 +38,9 @@
- #include <errno.h>
- #include <sys/mman.h>
- #include <dlfcn.h>
-+#ifdef __linux__
-+#include <sys/sysmacros.h>
-+#endif
- #include <i915_drm.h>
-
- #include "intel_aub.h"
---
-2.8.2
-
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch
new file mode 100644
index 000000000000..ff51969def4d
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch
@@ -0,0 +1,53 @@
+From 0896b88d1b80244832f9eacbca993c5121315d05 Mon Sep 17 00:00:00 2001
+From: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Date: Thu, 26 Apr 2018 17:49:41 -0700
+Subject: lib: sync with the newer i915_pciids.h from the Kernel (KBL + ICL)
+
+I just copied the Kernel file into the IGT repository.
+
+New IDs:
+- KBL GT2 sku from 672e314b21dc ("drm/i915/kbl: Add KBL GT2 sku")
+- ICL IDs from d55cb4fa2cf0 ("drm/i915/icl: Add the ICL PCI IDs")
+
+Cc: Matt Atwood <matthew.s.atwood@intel.com>
+Acked-by: Antonio Argenziano <antonio.argenziano@intel.com>
+Reviewed-by: Jose Roberto de Souza <jose.souza@intel.com>
+Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
+---
+ lib/i915_pciids.h | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/patch/?id=0896b88d1b80244832f9eacbca993c5121315d05
+
+diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
+index 0b2ba46..bab70ff 100644
+--- a/lib/i915_pciids.h
++++ b/lib/i915_pciids.h
+@@ -349,6 +349,7 @@
+ #define INTEL_KBL_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
+ INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
++ INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
+ INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
+ INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
+ INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \
+@@ -431,4 +432,16 @@
+ INTEL_VGA_DEVICE(0x5A44, info), \
+ INTEL_VGA_DEVICE(0x5A4C, info)
+
++/* ICL */
++#define INTEL_ICL_11_IDS(info) \
++ INTEL_VGA_DEVICE(0x8A50, info), \
++ INTEL_VGA_DEVICE(0x8A51, info), \
++ INTEL_VGA_DEVICE(0x8A5C, info), \
++ INTEL_VGA_DEVICE(0x8A5D, info), \
++ INTEL_VGA_DEVICE(0x8A52, info), \
++ INTEL_VGA_DEVICE(0x8A5A, info), \
++ INTEL_VGA_DEVICE(0x8A5B, info), \
++ INTEL_VGA_DEVICE(0x8A71, info), \
++ INTEL_VGA_DEVICE(0x8A70, info)
++
+ #endif /* _I915_PCIIDS_H */
+--
+cgit v1.1
+