* [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
@ 2018-10-12 20:27 Rodrigo Vivi
2018-10-12 20:38 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
2018-10-12 23:03 ` [igt-dev] ✓ Fi.CI.BAT: success for lib: sync i915_pciids.h with kernel (rev2) Patchwork
0 siblings, 2 replies; 7+ messages in thread
From: Rodrigo Vivi @ 2018-10-12 20:27 UTC (permalink / raw)
To: igt-dev; +Cc: Rodrigo Vivi
One more AML ID added and WHL IDs reorganized.
Align with commit c0c46ca461f1 ("drm/i915/aml: Add new Amber
Lake PCI ID"), including commit c1c8f6fa731b ("drm/i915:
Redefine some Whiskey Lake SKUs")
Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
lib/i915_pciids.h | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index fd965ffb..19266714 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -365,16 +365,20 @@
INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
/* AML/KBL Y GT2 */
-#define INTEL_AML_GT2_IDS(info) \
+#define INTEL_AML_KBL_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
+/* AML/CFL Y GT2 */
+#define INTEL_AML_CFL_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x87CA, info)
+
#define INTEL_KBL_IDS(info) \
INTEL_KBL_GT1_IDS(info), \
INTEL_KBL_GT2_IDS(info), \
INTEL_KBL_GT3_IDS(info), \
INTEL_KBL_GT4_IDS(info), \
- INTEL_AML_GT2_IDS(info)
+ INTEL_AML_KBL_GT2_IDS(info)
/* CFL S */
#define INTEL_CFL_S_GT1_IDS(info) \
@@ -407,17 +411,17 @@
/* WHL/CFL U GT1 */
#define INTEL_WHL_U_GT1_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA1, info)
+ INTEL_VGA_DEVICE(0x3EA1, info), \
+ INTEL_VGA_DEVICE(0x3EA4, info)
/* WHL/CFL U GT2 */
#define INTEL_WHL_U_GT2_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA0, info)
+ INTEL_VGA_DEVICE(0x3EA0, info), \
+ INTEL_VGA_DEVICE(0x3EA3, info)
/* WHL/CFL U GT3 */
#define INTEL_WHL_U_GT3_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA2, info), \
- INTEL_VGA_DEVICE(0x3EA3, info), \
- INTEL_VGA_DEVICE(0x3EA4, info)
+ INTEL_VGA_DEVICE(0x3EA2, info)
#define INTEL_CFL_IDS(info) \
INTEL_CFL_S_GT1_IDS(info), \
@@ -427,7 +431,8 @@
INTEL_CFL_U_GT3_IDS(info), \
INTEL_WHL_U_GT1_IDS(info), \
INTEL_WHL_U_GT2_IDS(info), \
- INTEL_WHL_U_GT3_IDS(info)
+ INTEL_WHL_U_GT3_IDS(info), \
+ INTEL_AML_CFL_GT2_IDS(info)
/* CNL */
#define INTEL_CNL_IDS(info) \
--
2.17.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [igt-dev] ✗ Fi.CI.BAT: failure for lib: sync i915_pciids.h with kernel
2018-10-12 20:27 [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel Rodrigo Vivi
@ 2018-10-12 20:38 ` Patchwork
2018-10-12 21:39 ` Souza, Jose
2018-10-12 23:03 ` [igt-dev] ✓ Fi.CI.BAT: success for lib: sync i915_pciids.h with kernel (rev2) Patchwork
1 sibling, 1 reply; 7+ messages in thread
From: Patchwork @ 2018-10-12 20:38 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: igt-dev
== Series Details ==
Series: lib: sync i915_pciids.h with kernel
URL : https://patchwork.freedesktop.org/series/50957/
State : failure
== Summary ==
IGT patchset build failed on latest successful build
93871c6fb3c25e5d350c9faf36ded917174214de Add TODO.rst
INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info),
^~~~~~~~~~~~~~~~~~~
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
static const struct pci_id_match intel_device_match[] = {
^
../lib/intel_device_info.c:348:2:
INTEL_AML_GT2_IDS(&intel_kabylake_gt2_info),
{
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
../lib/intel_device_info.c:292:57: warning: missing braces around initializer [-Wmissing-braces]
ninja: build stopped: subcommand failed.
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] ✗ Fi.CI.BAT: failure for lib: sync i915_pciids.h with kernel
2018-10-12 20:38 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
@ 2018-10-12 21:39 ` Souza, Jose
2018-10-12 22:40 ` [igt-dev] [PATCH i-g-t] " Rodrigo Vivi
0 siblings, 1 reply; 7+ messages in thread
From: Souza, Jose @ 2018-10-12 21:39 UTC (permalink / raw)
To: igt-dev@lists.freedesktop.org, Vivi, Rodrigo
On Fri, 2018-10-12 at 20:38 +0000, Patchwork wrote:
> == Series Details ==
>
> Series: lib: sync i915_pciids.h with kernel
> URL : https://patchwork.freedesktop.org/series/50957/
> State : failure
>
> == Summary ==
>
> IGT patchset build failed on latest successful build
> 93871c6fb3c25e5d350c9faf36ded917174214de Add TODO.rst
>
> INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info),
> ^~~~~~~~~~~~~~~~~~~
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> static const struct pci_id_match intel_device_match[] = {
> ^
> ../lib/intel_device_info.c:348:2:
> INTEL_AML_GT2_IDS(&intel_kabylake_gt2_info),
> {
Because of the rename and addition of other AML grop we need to sync
intel_device_info.c too
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ../lib/intel_device_info.c:292:57: warning: missing braces around
> initializer [-Wmissing-braces]
> ninja: build stopped: subcommand failed.
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2018-10-12 21:39 ` Souza, Jose
@ 2018-10-12 22:40 ` Rodrigo Vivi
2018-10-12 23:16 ` Souza, Jose
0 siblings, 1 reply; 7+ messages in thread
From: Rodrigo Vivi @ 2018-10-12 22:40 UTC (permalink / raw)
To: igt-dev; +Cc: Rodrigo Vivi
One more AML ID added and WHL IDs reorganized.
Align with commit c0c46ca461f1 ("drm/i915/aml: Add new Amber
Lake PCI ID"), including commit c1c8f6fa731b ("drm/i915:
Redefine some Whiskey Lake SKUs")
v2: Also sync intel_device_info.c (CI and Jose)
Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
lib/i915_pciids.h | 21 +++++++++++++--------
lib/intel_device_info.c | 3 ++-
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index fd965ffb..19266714 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -365,16 +365,20 @@
INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
/* AML/KBL Y GT2 */
-#define INTEL_AML_GT2_IDS(info) \
+#define INTEL_AML_KBL_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
+/* AML/CFL Y GT2 */
+#define INTEL_AML_CFL_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x87CA, info)
+
#define INTEL_KBL_IDS(info) \
INTEL_KBL_GT1_IDS(info), \
INTEL_KBL_GT2_IDS(info), \
INTEL_KBL_GT3_IDS(info), \
INTEL_KBL_GT4_IDS(info), \
- INTEL_AML_GT2_IDS(info)
+ INTEL_AML_KBL_GT2_IDS(info)
/* CFL S */
#define INTEL_CFL_S_GT1_IDS(info) \
@@ -407,17 +411,17 @@
/* WHL/CFL U GT1 */
#define INTEL_WHL_U_GT1_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA1, info)
+ INTEL_VGA_DEVICE(0x3EA1, info), \
+ INTEL_VGA_DEVICE(0x3EA4, info)
/* WHL/CFL U GT2 */
#define INTEL_WHL_U_GT2_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA0, info)
+ INTEL_VGA_DEVICE(0x3EA0, info), \
+ INTEL_VGA_DEVICE(0x3EA3, info)
/* WHL/CFL U GT3 */
#define INTEL_WHL_U_GT3_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA2, info), \
- INTEL_VGA_DEVICE(0x3EA3, info), \
- INTEL_VGA_DEVICE(0x3EA4, info)
+ INTEL_VGA_DEVICE(0x3EA2, info)
#define INTEL_CFL_IDS(info) \
INTEL_CFL_S_GT1_IDS(info), \
@@ -427,7 +431,8 @@
INTEL_CFL_U_GT3_IDS(info), \
INTEL_WHL_U_GT1_IDS(info), \
INTEL_WHL_U_GT2_IDS(info), \
- INTEL_WHL_U_GT3_IDS(info)
+ INTEL_WHL_U_GT3_IDS(info), \
+ INTEL_AML_CFL_GT2_IDS(info)
/* CNL */
#define INTEL_CNL_IDS(info) \
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 5233be21..076168bf 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -345,7 +345,7 @@ static const struct pci_id_match intel_device_match[] = {
INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info),
INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
INTEL_KBL_GT4_IDS(&intel_kabylake_gt4_info),
- INTEL_AML_GT2_IDS(&intel_kabylake_gt2_info),
+ INTEL_AML_KBL_GT2_IDS(&intel_kabylake_gt2_info),
INTEL_GLK_IDS(&intel_geminilake_info),
@@ -357,6 +357,7 @@ static const struct pci_id_match intel_device_match[] = {
INTEL_WHL_U_GT1_IDS(&intel_coffeelake_gt1_info),
INTEL_WHL_U_GT2_IDS(&intel_coffeelake_gt2_info),
INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info),
+ INTEL_AML_CFL_GT2_IDS(&intel_coffeelake_gt2_info),
INTEL_CNL_IDS(&intel_cannonlake_info),
--
2.17.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for lib: sync i915_pciids.h with kernel (rev2)
2018-10-12 20:27 [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel Rodrigo Vivi
2018-10-12 20:38 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
@ 2018-10-12 23:03 ` Patchwork
1 sibling, 0 replies; 7+ messages in thread
From: Patchwork @ 2018-10-12 23:03 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: igt-dev
== Series Details ==
Series: lib: sync i915_pciids.h with kernel (rev2)
URL : https://patchwork.freedesktop.org/series/50957/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4973 -> IGTPW_1951 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/50957/revisions/2/mbox/
== Known issues ==
Here are the changes found in IGTPW_1951 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_module_reload@basic-reload:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106248, fdo#106725)
igt@drv_selftest@live_gem:
{fi-apl-guc}: NOTRUN -> INCOMPLETE (fdo#106693)
igt@kms_pipe_crc_basic@read-crc-pipe-b:
fi-byt-clapper: PASS -> FAIL (fdo#107362)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-byt-clapper: PASS -> FAIL (fdo#103191, fdo#107362) +1
==== Possible fixes ====
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
fi-byt-clapper: FAIL (fdo#107362) -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#106248 https://bugs.freedesktop.org/show_bug.cgi?id=106248
fdo#106693 https://bugs.freedesktop.org/show_bug.cgi?id=106693
fdo#106725 https://bugs.freedesktop.org/show_bug.cgi?id=106725
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
== Participating hosts (43 -> 42) ==
Additional (4): fi-skl-guc fi-icl-u fi-gdg-551 fi-apl-guc
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* IGT: IGT_4673 -> IGTPW_1951
CI_DRM_4973: 60ba18212b324d02e961232953f190612d7a6ca3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_1951: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1951/
IGT_4673: 54cb1aeb4e50dea9f3abae632e317875d147c4ab @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1951/issues.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2018-10-12 22:40 ` [igt-dev] [PATCH i-g-t] " Rodrigo Vivi
@ 2018-10-12 23:16 ` Souza, Jose
2018-10-15 16:02 ` Rodrigo Vivi
0 siblings, 1 reply; 7+ messages in thread
From: Souza, Jose @ 2018-10-12 23:16 UTC (permalink / raw)
To: Vivi, Rodrigo, igt-dev@lists.freedesktop.org
On Fri, 2018-10-12 at 15:40 -0700, Rodrigo Vivi wrote:
> One more AML ID added and WHL IDs reorganized.
>
> Align with commit c0c46ca461f1 ("drm/i915/aml: Add new Amber
> Lake PCI ID"), including commit c1c8f6fa731b ("drm/i915:
> Redefine some Whiskey Lake SKUs")
>
> v2: Also sync intel_device_info.c (CI and Jose)
>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
> Cc: José Roberto de Souza <jose.souza@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> lib/i915_pciids.h | 21 +++++++++++++--------
> lib/intel_device_info.c | 3 ++-
> 2 files changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index fd965ffb..19266714 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -365,16 +365,20 @@
> INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
>
> /* AML/KBL Y GT2 */
> -#define INTEL_AML_GT2_IDS(info) \
> +#define INTEL_AML_KBL_GT2_IDS(info) \
> INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
> INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
>
> +/* AML/CFL Y GT2 */
> +#define INTEL_AML_CFL_GT2_IDS(info) \
> + INTEL_VGA_DEVICE(0x87CA, info)
> +
> #define INTEL_KBL_IDS(info) \
> INTEL_KBL_GT1_IDS(info), \
> INTEL_KBL_GT2_IDS(info), \
> INTEL_KBL_GT3_IDS(info), \
> INTEL_KBL_GT4_IDS(info), \
> - INTEL_AML_GT2_IDS(info)
> + INTEL_AML_KBL_GT2_IDS(info)
>
> /* CFL S */
> #define INTEL_CFL_S_GT1_IDS(info) \
> @@ -407,17 +411,17 @@
>
> /* WHL/CFL U GT1 */
> #define INTEL_WHL_U_GT1_IDS(info) \
> - INTEL_VGA_DEVICE(0x3EA1, info)
> + INTEL_VGA_DEVICE(0x3EA1, info), \
> + INTEL_VGA_DEVICE(0x3EA4, info)
>
> /* WHL/CFL U GT2 */
> #define INTEL_WHL_U_GT2_IDS(info) \
> - INTEL_VGA_DEVICE(0x3EA0, info)
> + INTEL_VGA_DEVICE(0x3EA0, info), \
> + INTEL_VGA_DEVICE(0x3EA3, info)
>
> /* WHL/CFL U GT3 */
> #define INTEL_WHL_U_GT3_IDS(info) \
> - INTEL_VGA_DEVICE(0x3EA2, info), \
> - INTEL_VGA_DEVICE(0x3EA3, info), \
> - INTEL_VGA_DEVICE(0x3EA4, info)
> + INTEL_VGA_DEVICE(0x3EA2, info)
>
> #define INTEL_CFL_IDS(info) \
> INTEL_CFL_S_GT1_IDS(info), \
> @@ -427,7 +431,8 @@
> INTEL_CFL_U_GT3_IDS(info), \
> INTEL_WHL_U_GT1_IDS(info), \
> INTEL_WHL_U_GT2_IDS(info), \
> - INTEL_WHL_U_GT3_IDS(info)
> + INTEL_WHL_U_GT3_IDS(info), \
> + INTEL_AML_CFL_GT2_IDS(info)
>
> /* CNL */
> #define INTEL_CNL_IDS(info) \
> diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> index 5233be21..076168bf 100644
> --- a/lib/intel_device_info.c
> +++ b/lib/intel_device_info.c
> @@ -345,7 +345,7 @@ static const struct pci_id_match
> intel_device_match[] = {
> INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info),
> INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
> INTEL_KBL_GT4_IDS(&intel_kabylake_gt4_info),
> - INTEL_AML_GT2_IDS(&intel_kabylake_gt2_info),
> + INTEL_AML_KBL_GT2_IDS(&intel_kabylake_gt2_info),
>
> INTEL_GLK_IDS(&intel_geminilake_info),
>
> @@ -357,6 +357,7 @@ static const struct pci_id_match
> intel_device_match[] = {
> INTEL_WHL_U_GT1_IDS(&intel_coffeelake_gt1_info),
> INTEL_WHL_U_GT2_IDS(&intel_coffeelake_gt2_info),
> INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info),
> + INTEL_AML_CFL_GT2_IDS(&intel_coffeelake_gt2_info),
>
> INTEL_CNL_IDS(&intel_cannonlake_info),
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
2018-10-12 23:16 ` Souza, Jose
@ 2018-10-15 16:02 ` Rodrigo Vivi
0 siblings, 0 replies; 7+ messages in thread
From: Rodrigo Vivi @ 2018-10-15 16:02 UTC (permalink / raw)
To: Souza, Jose; +Cc: igt-dev@lists.freedesktop.org
On Fri, Oct 12, 2018 at 11:16:45PM +0000, Souza, Jose wrote:
> On Fri, 2018-10-12 at 15:40 -0700, Rodrigo Vivi wrote:
> > One more AML ID added and WHL IDs reorganized.
> >
> > Align with commit c0c46ca461f1 ("drm/i915/aml: Add new Amber
> > Lake PCI ID"), including commit c1c8f6fa731b ("drm/i915:
> > Redefine some Whiskey Lake SKUs")
> >
> > v2: Also sync intel_device_info.c (CI and Jose)
> >
>
> Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
thanks!
pushed to ssh://git.freedesktop.org/git/xorg/app/intel-gpu-tools
since I couldn't find yet the gitlab and I noticed activity
on old git.
>
> > Cc: José Roberto de Souza <jose.souza@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> > lib/i915_pciids.h | 21 +++++++++++++--------
> > lib/intel_device_info.c | 3 ++-
> > 2 files changed, 15 insertions(+), 9 deletions(-)
> >
> > diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> > index fd965ffb..19266714 100644
> > --- a/lib/i915_pciids.h
> > +++ b/lib/i915_pciids.h
> > @@ -365,16 +365,20 @@
> > INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
> >
> > /* AML/KBL Y GT2 */
> > -#define INTEL_AML_GT2_IDS(info) \
> > +#define INTEL_AML_KBL_GT2_IDS(info) \
> > INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
> > INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
> >
> > +/* AML/CFL Y GT2 */
> > +#define INTEL_AML_CFL_GT2_IDS(info) \
> > + INTEL_VGA_DEVICE(0x87CA, info)
> > +
> > #define INTEL_KBL_IDS(info) \
> > INTEL_KBL_GT1_IDS(info), \
> > INTEL_KBL_GT2_IDS(info), \
> > INTEL_KBL_GT3_IDS(info), \
> > INTEL_KBL_GT4_IDS(info), \
> > - INTEL_AML_GT2_IDS(info)
> > + INTEL_AML_KBL_GT2_IDS(info)
> >
> > /* CFL S */
> > #define INTEL_CFL_S_GT1_IDS(info) \
> > @@ -407,17 +411,17 @@
> >
> > /* WHL/CFL U GT1 */
> > #define INTEL_WHL_U_GT1_IDS(info) \
> > - INTEL_VGA_DEVICE(0x3EA1, info)
> > + INTEL_VGA_DEVICE(0x3EA1, info), \
> > + INTEL_VGA_DEVICE(0x3EA4, info)
> >
> > /* WHL/CFL U GT2 */
> > #define INTEL_WHL_U_GT2_IDS(info) \
> > - INTEL_VGA_DEVICE(0x3EA0, info)
> > + INTEL_VGA_DEVICE(0x3EA0, info), \
> > + INTEL_VGA_DEVICE(0x3EA3, info)
> >
> > /* WHL/CFL U GT3 */
> > #define INTEL_WHL_U_GT3_IDS(info) \
> > - INTEL_VGA_DEVICE(0x3EA2, info), \
> > - INTEL_VGA_DEVICE(0x3EA3, info), \
> > - INTEL_VGA_DEVICE(0x3EA4, info)
> > + INTEL_VGA_DEVICE(0x3EA2, info)
> >
> > #define INTEL_CFL_IDS(info) \
> > INTEL_CFL_S_GT1_IDS(info), \
> > @@ -427,7 +431,8 @@
> > INTEL_CFL_U_GT3_IDS(info), \
> > INTEL_WHL_U_GT1_IDS(info), \
> > INTEL_WHL_U_GT2_IDS(info), \
> > - INTEL_WHL_U_GT3_IDS(info)
> > + INTEL_WHL_U_GT3_IDS(info), \
> > + INTEL_AML_CFL_GT2_IDS(info)
> >
> > /* CNL */
> > #define INTEL_CNL_IDS(info) \
> > diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> > index 5233be21..076168bf 100644
> > --- a/lib/intel_device_info.c
> > +++ b/lib/intel_device_info.c
> > @@ -345,7 +345,7 @@ static const struct pci_id_match
> > intel_device_match[] = {
> > INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info),
> > INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
> > INTEL_KBL_GT4_IDS(&intel_kabylake_gt4_info),
> > - INTEL_AML_GT2_IDS(&intel_kabylake_gt2_info),
> > + INTEL_AML_KBL_GT2_IDS(&intel_kabylake_gt2_info),
> >
> > INTEL_GLK_IDS(&intel_geminilake_info),
> >
> > @@ -357,6 +357,7 @@ static const struct pci_id_match
> > intel_device_match[] = {
> > INTEL_WHL_U_GT1_IDS(&intel_coffeelake_gt1_info),
> > INTEL_WHL_U_GT2_IDS(&intel_coffeelake_gt2_info),
> > INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info),
> > + INTEL_AML_CFL_GT2_IDS(&intel_coffeelake_gt2_info),
> >
> > INTEL_CNL_IDS(&intel_cannonlake_info),
> >
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-10-15 16:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-12 20:27 [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel Rodrigo Vivi
2018-10-12 20:38 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
2018-10-12 21:39 ` Souza, Jose
2018-10-12 22:40 ` [igt-dev] [PATCH i-g-t] " Rodrigo Vivi
2018-10-12 23:16 ` Souza, Jose
2018-10-15 16:02 ` Rodrigo Vivi
2018-10-12 23:03 ` [igt-dev] ✓ Fi.CI.BAT: success for lib: sync i915_pciids.h with kernel (rev2) Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox