public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
Date: Fri, 12 Oct 2018 15:40:10 -0700	[thread overview]
Message-ID: <20181012224010.26392-1-rodrigo.vivi@intel.com> (raw)
In-Reply-To: <11148a9416522aa5e63427a916b534b1e29c5af4.camel@intel.com>

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

  reply	other threads:[~2018-10-12 22:40 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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     ` Rodrigo Vivi [this message]
2018-10-12 23:16       ` [igt-dev] [PATCH i-g-t] " 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
  -- strict thread matches above, loose matches on Subject: below --
2019-02-02  8:08 [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel Rodrigo Vivi
2019-02-04 18:12 ` Lionel Landwerlin
2019-02-04 18:46 ` Souza, Jose
2019-02-04 18:47   ` Rodrigo Vivi
2020-03-20  0:13 [igt-dev] [PATCH i-g-t] lib: Sync " Swathi Dhanavanthri
2020-03-25 20:48 ` Matt Roper
2020-10-23  1:05 [igt-dev] [PATCH i-g-t] lib: sync " Ashutosh Dixit
2020-10-23  3:18 Ashutosh Dixit
2020-10-23  7:59 ` Petri Latvala
2020-10-23  8:03   ` Petri Latvala
2020-10-23 15:55     ` Dixit, Ashutosh
2020-10-26  8:30       ` Petri Latvala
2021-06-03 14:31 Matt Roper
2021-06-03 15:05 ` James Ausmus
2021-06-03 18:58 ` Srivatsa, Anusha
2022-07-27  4:34 Matt Roper

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181012224010.26392-1-rodrigo.vivi@intel.com \
    --to=rodrigo.vivi@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox