Commit bfbda472 authored by Jani Nikula's avatar Jani Nikula

drm/i915/pciids: remove 11 from INTEL_ICL_IDS()

Most other PCI ID macros do not encode the gen in the name. Follow suit
for ICL.

Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://patchwork.freedesktop.org/patch/msgid/36973674bf333dfdd7cd32ae656754bfa150022b.1715340032.git.jani.nikula@intel.comSigned-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent aa3d586e
...@@ -547,7 +547,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = { ...@@ -547,7 +547,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
INTEL_CML_IDS(&gen9_early_ops), INTEL_CML_IDS(&gen9_early_ops),
INTEL_GLK_IDS(&gen9_early_ops), INTEL_GLK_IDS(&gen9_early_ops),
INTEL_CNL_IDS(&gen9_early_ops), INTEL_CNL_IDS(&gen9_early_ops),
INTEL_ICL_11_IDS(&gen11_early_ops), INTEL_ICL_IDS(&gen11_early_ops),
INTEL_EHL_IDS(&gen11_early_ops), INTEL_EHL_IDS(&gen11_early_ops),
INTEL_JSL_IDS(&gen11_early_ops), INTEL_JSL_IDS(&gen11_early_ops),
INTEL_TGL_12_IDS(&gen11_early_ops), INTEL_TGL_12_IDS(&gen11_early_ops),
......
...@@ -831,7 +831,7 @@ static const struct { ...@@ -831,7 +831,7 @@ static const struct {
INTEL_CFL_IDS(&skl_display), INTEL_CFL_IDS(&skl_display),
INTEL_WHL_IDS(&skl_display), INTEL_WHL_IDS(&skl_display),
INTEL_CML_IDS(&skl_display), INTEL_CML_IDS(&skl_display),
INTEL_ICL_11_IDS(&icl_display), INTEL_ICL_IDS(&icl_display),
INTEL_EHL_IDS(&jsl_ehl_display), INTEL_EHL_IDS(&jsl_ehl_display),
INTEL_JSL_IDS(&jsl_ehl_display), INTEL_JSL_IDS(&jsl_ehl_display),
INTEL_TGL_12_IDS(&tgl_display), INTEL_TGL_12_IDS(&tgl_display),
......
...@@ -857,7 +857,7 @@ static const struct pci_device_id pciidlist[] = { ...@@ -857,7 +857,7 @@ static const struct pci_device_id pciidlist[] = {
INTEL_CML_GT2_IDS(&cml_gt2_info), INTEL_CML_GT2_IDS(&cml_gt2_info),
INTEL_CML_U_GT1_IDS(&cml_gt1_info), INTEL_CML_U_GT1_IDS(&cml_gt1_info),
INTEL_CML_U_GT2_IDS(&cml_gt2_info), INTEL_CML_U_GT2_IDS(&cml_gt2_info),
INTEL_ICL_11_IDS(&icl_info), INTEL_ICL_IDS(&icl_info),
INTEL_EHL_IDS(&ehl_info), INTEL_EHL_IDS(&ehl_info),
INTEL_JSL_IDS(&jsl_info), INTEL_JSL_IDS(&jsl_info),
INTEL_TGL_12_IDS(&tgl_info), INTEL_TGL_12_IDS(&tgl_info),
......
...@@ -597,7 +597,7 @@ ...@@ -597,7 +597,7 @@
INTEL_VGA_DEVICE(0x8A70, info), \ INTEL_VGA_DEVICE(0x8A70, info), \
INTEL_VGA_DEVICE(0x8A71, info) INTEL_VGA_DEVICE(0x8A71, info)
#define INTEL_ICL_11_IDS(info) \ #define INTEL_ICL_IDS(info) \
INTEL_ICL_PORT_F_IDS(info), \ INTEL_ICL_PORT_F_IDS(info), \
INTEL_VGA_DEVICE(0x8A51, info), \ INTEL_VGA_DEVICE(0x8A51, info), \
INTEL_VGA_DEVICE(0x8A5D, info) INTEL_VGA_DEVICE(0x8A5D, info)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment