drm/i915/pciids: add INTEL_IVB_IDS()

Add INTEL_IVB_IDS() to identify all IVBs except IVB Q transcode.

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/ed89a25b2c6bce318fe59e883d18b62d9453196b.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 23ded9260302b584c8204ecb32d5d0e92fa6ed79..6549507003ecfa34114f0d7faba5fe1f9873589b 100644 (file)
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -535,8 +535,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
        INTEL_G45_IDS(&gen3_early_ops),
        INTEL_ILK_IDS(&gen3_early_ops),
        INTEL_SNB_IDS(&gen6_early_ops),
-       INTEL_IVB_M_IDS(&gen6_early_ops),
-       INTEL_IVB_D_IDS(&gen6_early_ops),
+       INTEL_IVB_IDS(&gen6_early_ops),
        INTEL_HSW_IDS(&gen6_early_ops),
        INTEL_BDW_IDS(&gen8_early_ops),
        INTEL_CHV_IDS(&chv_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 c40d12ca386ab476c50ad47d7a17c7e34e9605ea..bb681c8ed8a073de94d9eafd57bd867947a46c32 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -819,8 +819,7 @@ static const struct {
        INTEL_ILK_D_IDS(&ilk_d_display),
        INTEL_ILK_M_IDS(&ilk_m_display),
        INTEL_SNB_IDS(&snb_display),
-       INTEL_IVB_M_IDS(&ivb_display),
-       INTEL_IVB_D_IDS(&ivb_display),
+       INTEL_IVB_IDS(&ivb_display),
        INTEL_HSW_IDS(&hsw_display),
        INTEL_VLV_IDS(&vlv_display),
        INTEL_BDW_IDS(&bdw_display),

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 0d48c493dcceeddd2f839be6894926a335de4e53..16778d92346ba37d3f13ff83cc1df16ee73ae07a 100644 (file)
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -177,6 +177,10 @@
        INTEL_IVB_D_GT1_IDS(info), \
        INTEL_IVB_D_GT2_IDS(info)
 
+#define INTEL_IVB_IDS(info) \
+       INTEL_IVB_M_IDS(info), \
+       INTEL_IVB_D_IDS(info)
+
 #define INTEL_IVB_Q_IDS(info) \
        INTEL_QUANTA_VGA_DEVICE(info) /* Quanta transcode */