| Message ID | ffcb2d954ad9bca78ccd39836dc0a3dc7c6c0253.1715340032.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/pciids: PCI ID macro cleanups | expand |
On Fri, May 10, 2024 at 02:22:16PM +0300, Jani Nikula wrote: > Add INTEL_SNB_IDS() to identify all SNBs. Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: linux-pci@vger.kernel.org > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > arch/x86/kernel/early-quirks.c | 3 +-- > drivers/gpu/drm/i915/display/intel_display_device.c | 3 +-- > include/drm/i915_pciids.h | 4 ++++ > 3 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c > index d8419d310091..23ded9260302 100644 > --- 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 052fd1c290c3..c40d12ca386a 100644 > --- 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 05f466ca8ce2..0d48c493dcce 100644 > --- 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 */ > > -- > 2.39.2 >
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index d8419d310091..23ded9260302 100644 --- 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 052fd1c290c3..c40d12ca386a 100644 --- 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 05f466ca8ce2..0d48c493dcce 100644 --- 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 */
Add INTEL_SNB_IDS() to identify all SNBs. Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: linux-pci@vger.kernel.org Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- arch/x86/kernel/early-quirks.c | 3 +-- drivers/gpu/drm/i915/display/intel_display_device.c | 3 +-- include/drm/i915_pciids.h | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-)