drm/i915/pciids: add INTEL_SNB_IDS()

Add INTEL_SNB_IDS() to identify all SNBs.

Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ffcb2d954ad9bca78ccd39836dc0a3dc7c6c0253.1715340032.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index d8419d310091224b9a00cb42d6ccfb4aee8474f0..23ded9260302b584c8204ecb32d5d0e92fa6ed79 100644 (file)
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -534,8 +534,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
        INTEL_GM45_IDS(&gen3_early_ops),
        INTEL_G45_IDS(&gen3_early_ops),
        INTEL_ILK_IDS(&gen3_early_ops),
-       INTEL_SNB_D_IDS(&gen6_early_ops),
-       INTEL_SNB_M_IDS(&gen6_early_ops),
+       INTEL_SNB_IDS(&gen6_early_ops),
        INTEL_IVB_M_IDS(&gen6_early_ops),
        INTEL_IVB_D_IDS(&gen6_early_ops),
        INTEL_HSW_IDS(&gen6_early_ops),

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index 052fd1c290c3f69a90adaa03512d1b2acfb88d57..c40d12ca386ab476c50ad47d7a17c7e34e9605ea 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -818,8 +818,7 @@ static const struct {
        INTEL_PNV_IDS(&pnv_display),
        INTEL_ILK_D_IDS(&ilk_d_display),
        INTEL_ILK_M_IDS(&ilk_m_display),
-       INTEL_SNB_D_IDS(&snb_display),
-       INTEL_SNB_M_IDS(&snb_display),
+       INTEL_SNB_IDS(&snb_display),
        INTEL_IVB_M_IDS(&ivb_display),
        INTEL_IVB_D_IDS(&ivb_display),
        INTEL_HSW_IDS(&hsw_display),

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 05f466ca8ce2b79452fa34c788970bb21d526a88..0d48c493dcceeddd2f839be6894926a335de4e53 100644 (file)
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -151,6 +151,10 @@
        INTEL_SNB_M_GT1_IDS(info), \
        INTEL_SNB_M_GT2_IDS(info)
 
+#define INTEL_SNB_IDS(info) \
+       INTEL_SNB_D_IDS(info), \
+       INTEL_SNB_M_IDS(info)
+
 #define INTEL_IVB_M_GT1_IDS(info) \
        INTEL_VGA_DEVICE(0x0156, info) /* GT1 mobile */