From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
To: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>,
igt-dev@lists.freedesktop.org
Subject: Re: [PATCH i-g-t 2/2] lib: sync i915_pciids.h with kernel
Date: Mon, 8 Jan 2024 14:40:07 +0200 [thread overview]
Message-ID: <b5c218bc-168f-4b23-ba64-347e26f89ea2@gmail.com> (raw)
In-Reply-To: <20240105124641.784371-3-chaitanya.kumar.borah@intel.com>
On 5.1.2024 14.46, Chaitanya Kumar Borah wrote:
> This synchronizes with kernel commit
>
> 5032c607e886 ("drm/i915: ATS-M device ID update")
>
> Also move out macros which are not present in kernel header to
> i915_pciid_local.h
Hi Chaitanya,
I'd prefer you do one thing per patch. Ie. first move those pciids which
don't belong here to local file and then do synchronization. Otherwise
things look ok to me on this set. I do still wonder why those pvc pciids
are here in the first place but let's keep that issue outside of the
scope of these patches.
/Juha-Pekka
>
> Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> Cc: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
> ---
> lib/i915_pciids.h | 56 ++++++++++++++++++-----------------------
> lib/i915_pciids_local.h | 25 ++++++++++++++++++
> 2 files changed, 50 insertions(+), 31 deletions(-)
>
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index bee58554d..fcf1849aa 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -588,6 +588,7 @@
> INTEL_VGA_DEVICE(0x4551, info), \
> INTEL_VGA_DEVICE(0x4555, info), \
> INTEL_VGA_DEVICE(0x4557, info), \
> + INTEL_VGA_DEVICE(0x4570, info), \
> INTEL_VGA_DEVICE(0x4571, info)
>
> /* JSL */
> @@ -641,6 +642,7 @@
> INTEL_VGA_DEVICE(0x4682, info), \
> INTEL_VGA_DEVICE(0x4688, info), \
> INTEL_VGA_DEVICE(0x468A, info), \
> + INTEL_VGA_DEVICE(0x468B, info), \
> INTEL_VGA_DEVICE(0x4690, info), \
> INTEL_VGA_DEVICE(0x4692, info), \
> INTEL_VGA_DEVICE(0x4693, info)
> @@ -683,14 +685,22 @@
> INTEL_VGA_DEVICE(0xA78A, info), \
> INTEL_VGA_DEVICE(0xA78B, info)
>
> +/* RPL-U */
> +#define INTEL_RPLU_IDS(info) \
> + INTEL_VGA_DEVICE(0xA721, info), \
> + INTEL_VGA_DEVICE(0xA7A1, info), \
> + INTEL_VGA_DEVICE(0xA7A9, info), \
> + INTEL_VGA_DEVICE(0xA7AC, info), \
> + INTEL_VGA_DEVICE(0xA7AD, info)
> +
> /* RPL-P */
> #define INTEL_RPLP_IDS(info) \
> + INTEL_RPLU_IDS(info), \
> INTEL_VGA_DEVICE(0xA720, info), \
> - INTEL_VGA_DEVICE(0xA721, info), \
> INTEL_VGA_DEVICE(0xA7A0, info), \
> - INTEL_VGA_DEVICE(0xA7A1, info), \
> INTEL_VGA_DEVICE(0xA7A8, info), \
> - INTEL_VGA_DEVICE(0xA7A9, info)
> + INTEL_VGA_DEVICE(0xA7AA, info), \
> + INTEL_VGA_DEVICE(0xA7AB, info)
>
> /* DG2 */
> #define INTEL_DG2_G10_IDS(info) \
> @@ -705,11 +715,14 @@
> 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)
> + INTEL_VGA_DEVICE(0x56B1, info), \
> + INTEL_VGA_DEVICE(0x56BA, info), \
> + INTEL_VGA_DEVICE(0x56BB, info), \
> + INTEL_VGA_DEVICE(0x56BC, info), \
> + INTEL_VGA_DEVICE(0x56BD, info)
>
> #define INTEL_DG2_G12_IDS(info) \
> INTEL_VGA_DEVICE(0x5696, info), \
> @@ -725,7 +738,8 @@
> INTEL_DG2_G12_IDS(info)
>
> #define INTEL_ATS_M150_IDS(info) \
> - INTEL_VGA_DEVICE(0x56C0, info)
> + INTEL_VGA_DEVICE(0x56C0, info), \
> + INTEL_VGA_DEVICE(0x56C2, info)
>
> #define INTEL_ATS_M75_IDS(info) \
> INTEL_VGA_DEVICE(0x56C1, info)
> @@ -733,34 +747,14 @@
> #define INTEL_ATS_M_IDS(info) \
> INTEL_ATS_M150_IDS(info), \
> INTEL_ATS_M75_IDS(info)
> +
> /* MTL */
> -#define INTEL_MTL_M_IDS(info) \
> +#define INTEL_MTL_IDS(info) \
> INTEL_VGA_DEVICE(0x7D40, info), \
> - INTEL_VGA_DEVICE(0x7D60, info)
> -#define INTEL_MTL_P_GT2_IDS(info) \
> - INTEL_VGA_DEVICE(0x7D45, info)
> -#define INTEL_MTL_P_GT3_IDS(info) \
> + INTEL_VGA_DEVICE(0x7D45, info), \
> INTEL_VGA_DEVICE(0x7D55, info), \
> + INTEL_VGA_DEVICE(0x7D60, info), \
> + INTEL_VGA_DEVICE(0x7D67, info), \
> INTEL_VGA_DEVICE(0x7DD5, info)
> -#define INTEL_MTL_P_IDS(info) \
> - INTEL_MTL_P_GT2_IDS(info), \
> - INTEL_MTL_P_GT3_IDS(info)
> -
> -#define INTEL_MTL_IDS(info) \
> - INTEL_MTL_M_IDS(info), \
> - INTEL_MTL_P_IDS(info)
> -
> -/* PVC */
> -#define INTEL_PVC_IDS(info) \
> - INTEL_VGA_DEVICE(0x0BD0, info), \
> - INTEL_VGA_DEVICE(0x0BD5, info), \
> - INTEL_VGA_DEVICE(0x0BD6, info), \
> - INTEL_VGA_DEVICE(0x0BD7, info), \
> - INTEL_VGA_DEVICE(0x0BD8, info), \
> - INTEL_VGA_DEVICE(0x0BD9, info), \
> - INTEL_VGA_DEVICE(0x0BDA, info), \
> - INTEL_VGA_DEVICE(0x0BDB, info), \
> - INTEL_VGA_DEVICE(0x0BD1, info), \
> - INTEL_VGA_DEVICE(0x0BD2, info)
>
> #endif /* _I915_PCIIDS_H */
> diff --git a/lib/i915_pciids_local.h b/lib/i915_pciids_local.h
> index 91c26152a..a30e18526 100644
> --- a/lib/i915_pciids_local.h
> +++ b/lib/i915_pciids_local.h
> @@ -7,4 +7,29 @@
>
> #include "i915_pciids.h"
>
> +/* MTL perf */
> +#define INTEL_MTL_M_IDS(info) \
> + INTEL_VGA_DEVICE(0x7D60, info)
> +#define INTEL_MTL_P_GT2_IDS(info) \
> + INTEL_VGA_DEVICE(0x7D45, info)
> +#define INTEL_MTL_P_GT3_IDS(info) \
> + INTEL_VGA_DEVICE(0x7D55, info), \
> + INTEL_VGA_DEVICE(0x7DD5, info)
> +#define INTEL_MTL_P_IDS(info) \
> + INTEL_MTL_P_GT2_IDS(info), \
> + INTEL_MTL_P_GT3_IDS(info)
> +
> +/* PVC */
> +#define INTEL_PVC_IDS(info) \
> + INTEL_VGA_DEVICE(0x0BD0, info), \
> + INTEL_VGA_DEVICE(0x0BD5, info), \
> + INTEL_VGA_DEVICE(0x0BD6, info), \
> + INTEL_VGA_DEVICE(0x0BD7, info), \
> + INTEL_VGA_DEVICE(0x0BD8, info), \
> + INTEL_VGA_DEVICE(0x0BD9, info), \
> + INTEL_VGA_DEVICE(0x0BDA, info), \
> + INTEL_VGA_DEVICE(0x0BDB, info), \
> + INTEL_VGA_DEVICE(0x0BD1, info), \
> + INTEL_VGA_DEVICE(0x0BD2, info)
> +
> #endif /* _I915_PCIIDS_LOCAL_H */
next prev parent reply other threads:[~2024-01-08 12:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-05 12:46 [PATCH i-g-t 0/2] Sync i915_pciid.h Chaitanya Kumar Borah
2024-01-05 12:46 ` [PATCH i-g-t 1/2] lib/i915/perf: include i915_pciid_local.h Chaitanya Kumar Borah
2024-01-05 12:46 ` [PATCH i-g-t 2/2] lib: sync i915_pciids.h with kernel Chaitanya Kumar Borah
2024-01-08 12:40 ` Juha-Pekka Heikkila [this message]
2024-01-09 6:21 ` Borah, Chaitanya Kumar
2024-01-05 13:53 ` ✓ CI.xeBAT: success for Sync i915_pciid.h Patchwork
2024-01-05 13:53 ` ✓ Fi.CI.BAT: " Patchwork
2024-01-05 23:39 ` ✗ Fi.CI.IGT: failure " Patchwork
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=b5c218bc-168f-4b23-ba64-347e26f89ea2@gmail.com \
--to=juhapekka.heikkila@gmail.com \
--cc=chaitanya.kumar.borah@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