From: Matt Roper <matthew.d.roper@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t] lib: sync i915_pciids.h with kernel
Date: Tue, 26 Jul 2022 21:34:52 -0700 [thread overview]
Message-ID: <20220727043452.4024839-1-matthew.d.roper@intel.com> (raw)
This synchronizes with kernel commit
7835303982d1 ("drm/i915/mtl: Add MeteorLake PCI IDs")
to bring in DG2/ATS-M and initial MTL PCI IDs.
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
lib/i915_pciids.h | 55 +++++++++++++++++++++++++++++++++++++++++
lib/i915_pciids_local.h | 21 ----------------
2 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index a7b5eea7..278031aa 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -692,4 +692,59 @@
INTEL_VGA_DEVICE(0xA7A8, info), \
INTEL_VGA_DEVICE(0xA7A9, info)
+/* DG2 */
+#define INTEL_DG2_G10_IDS(info) \
+ INTEL_VGA_DEVICE(0x5690, info), \
+ INTEL_VGA_DEVICE(0x5691, info), \
+ INTEL_VGA_DEVICE(0x5692, info), \
+ INTEL_VGA_DEVICE(0x56A0, info), \
+ INTEL_VGA_DEVICE(0x56A1, info), \
+ INTEL_VGA_DEVICE(0x56A2, info)
+
+#define INTEL_DG2_G11_IDS(info) \
+ INTEL_VGA_DEVICE(0x5693, info), \
+ INTEL_VGA_DEVICE(0x5694, info), \
+ INTEL_VGA_DEVICE(0x5695, info), \
+ INTEL_VGA_DEVICE(0x5698, info), \
+ INTEL_VGA_DEVICE(0x56A5, info), \
+ INTEL_VGA_DEVICE(0x56A6, info), \
+ INTEL_VGA_DEVICE(0x56B0, info), \
+ INTEL_VGA_DEVICE(0x56B1, info)
+
+#define INTEL_DG2_G12_IDS(info) \
+ INTEL_VGA_DEVICE(0x5696, info), \
+ INTEL_VGA_DEVICE(0x5697, info), \
+ INTEL_VGA_DEVICE(0x56A3, info), \
+ INTEL_VGA_DEVICE(0x56A4, info), \
+ INTEL_VGA_DEVICE(0x56B2, info), \
+ INTEL_VGA_DEVICE(0x56B3, info)
+
+#define INTEL_DG2_IDS(info) \
+ INTEL_DG2_G10_IDS(info), \
+ INTEL_DG2_G11_IDS(info), \
+ INTEL_DG2_G12_IDS(info)
+
+#define INTEL_ATS_M150_IDS(info) \
+ INTEL_VGA_DEVICE(0x56C0, info)
+
+#define INTEL_ATS_M75_IDS(info) \
+ INTEL_VGA_DEVICE(0x56C1, info)
+
+#define INTEL_ATS_M_IDS(info) \
+ INTEL_ATS_M150_IDS(info), \
+ INTEL_ATS_M75_IDS(info)
+/* MTL */
+#define INTEL_MTL_M_IDS(info) \
+ INTEL_VGA_DEVICE(0x7D40, info), \
+ INTEL_VGA_DEVICE(0x7D60, info)
+
+#define INTEL_MTL_P_IDS(info) \
+ INTEL_VGA_DEVICE(0x7D45, info), \
+ INTEL_VGA_DEVICE(0x7D55, info), \
+ INTEL_VGA_DEVICE(0x7DD5, info)
+
+#define INTEL_MTL_IDS(info) \
+ INTEL_MTL_M_IDS(info), \
+ INTEL_MTL_P_IDS(info)
+
#endif /* _I915_PCIIDS_H */
diff --git a/lib/i915_pciids_local.h b/lib/i915_pciids_local.h
index b3ac70ff..91c26152 100644
--- a/lib/i915_pciids_local.h
+++ b/lib/i915_pciids_local.h
@@ -7,25 +7,4 @@
#include "i915_pciids.h"
-/* DG2 */
-#define INTEL_DG2_IDS(info) \
- INTEL_VGA_DEVICE(0x56A0, info), \
- INTEL_VGA_DEVICE(0x56A1, info), \
- INTEL_VGA_DEVICE(0x56A2, info), \
- INTEL_VGA_DEVICE(0x56A3, info), \
- INTEL_VGA_DEVICE(0x56A4, info), \
- INTEL_VGA_DEVICE(0x56A5, info), \
- INTEL_VGA_DEVICE(0x56A6, info)
-
-/* ATS-M */
-#define INTEL_ATS_M150_IDS(info) \
- INTEL_VGA_DEVICE(0x56C0, info)
-
-#define INTEL_ATS_M75_IDS(info) \
- INTEL_VGA_DEVICE(0x56C1, info)
-
-#define INTEL_ATS_M_IDS(info) \
- INTEL_ATS_M150_IDS(info), \
- INTEL_ATS_M75_IDS(info)
-
#endif /* _I915_PCIIDS_LOCAL_H */
--
2.37.1
next reply other threads:[~2022-07-27 4:35 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-27 4:34 Matt Roper [this message]
2022-07-27 5:29 ` [igt-dev] ✓ Fi.CI.BAT: success for lib: sync i915_pciids.h with kernel (rev13) Patchwork
2022-07-27 7:10 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2022-08-03 15:00 ` [igt-dev] [i-g-t] lib: sync i915_pciids.h with kernel Wayne Boyer
-- strict thread matches above, loose matches on Subject: below --
2021-06-03 14:31 [igt-dev] [PATCH i-g-t] " Matt Roper
2021-06-03 15:05 ` James Ausmus
2021-06-03 18:58 ` Srivatsa, Anusha
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
2020-10-23 1:05 Ashutosh Dixit
2020-03-20 0:13 [igt-dev] [PATCH i-g-t] lib: Sync " Swathi Dhanavanthri
2020-03-25 20:48 ` Matt Roper
2019-02-02 8:08 [igt-dev] [PATCH i-g-t] lib: sync " Rodrigo Vivi
2019-02-04 18:12 ` Lionel Landwerlin
2019-02-04 18:46 ` Souza, Jose
2019-02-04 18:47 ` Rodrigo Vivi
2018-10-12 21:39 [igt-dev] ✗ Fi.CI.BAT: failure for " 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 20:27 Rodrigo Vivi
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=20220727043452.4024839-1-matthew.d.roper@intel.com \
--to=matthew.d.roper@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