On Wed, Sep 04, 2024 at 12:51:33PM +0300, Jani Nikula wrote:
> Avoid including PCI IDs for one platform to the PCI IDs of another. It's
> more clear to deal with them completely separately at the PCI ID macro
> level.
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display_device.c | 1 +
> drivers/gpu/drm/i915/i915_pci.c | 1 +
> include/drm/intel/i915_pciids.h | 4 ++--
> 3 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
> index 1b46ba985580..408c76852495 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.c
> @@ -1318,6 +1318,7 @@ static const struct {
> INTEL_RPLU_IDS(INTEL_DISPLAY_DEVICE, &adl_p_desc),
> INTEL_RPLP_IDS(INTEL_DISPLAY_DEVICE, &adl_p_desc),
> INTEL_DG2_IDS(INTEL_DISPLAY_DEVICE, &dg2_desc),
> + INTEL_ARL_IDS(INTEL_DISPLAY_DEVICE, &mtl_desc),
> INTEL_MTL_IDS(INTEL_DISPLAY_DEVICE, &mtl_desc),
> INTEL_LNL_IDS(INTEL_DISPLAY_DEVICE, &lnl_desc),
> INTEL_BMG_IDS(INTEL_DISPLAY_DEVICE, &bmg_desc),
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index d37bb3a704d0..617f411feb8c 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -870,6 +870,7 @@ static const struct pci_device_id pciidlist[] = {
> INTEL_RPLP_IDS(INTEL_VGA_DEVICE, &adl_p_info),
> INTEL_DG2_IDS(INTEL_VGA_DEVICE, &dg2_info),
> INTEL_ATS_M_IDS(INTEL_VGA_DEVICE, &ats_m_info),
> + INTEL_ARL_IDS(INTEL_VGA_DEVICE, &mtl_info),
> INTEL_MTL_IDS(INTEL_VGA_DEVICE, &mtl_info),
> {}
> };
> diff --git a/include/drm/intel/i915_pciids.h b/include/drm/intel/i915_pciids.h
> index 6a78df5687c5..cbb12fdbcb7f 100644
> --- a/include/drm/intel/i915_pciids.h
> +++ b/include/drm/intel/i915_pciids.h
> @@ -764,15 +764,15 @@
> INTEL_ATS_M150_IDS(MACRO__, ## __VA_ARGS__), \
> INTEL_ATS_M75_IDS(MACRO__, ## __VA_ARGS__)
>
> -/* MTL */
> +/* ARL */
> #define INTEL_ARL_IDS(MACRO__, ...) \
> MACRO__(0x7D41, ## __VA_ARGS__), \
> MACRO__(0x7D51, ## __VA_ARGS__), \
> MACRO__(0x7D67, ## __VA_ARGS__), \
> MACRO__(0x7DD1, ## __VA_ARGS__)
>
> +/* MTL */
> #define INTEL_MTL_IDS(MACRO__, ...) \
> - INTEL_ARL_IDS(MACRO__, ## __VA_ARGS__), \
> MACRO__(0x7D40, ## __VA_ARGS__), \
> MACRO__(0x7D45, ## __VA_ARGS__), \
> MACRO__(0x7D55, ## __VA_ARGS__), \
> --
> 2.39.2
>
