github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/pciids: add INTEL_ILK_IDS(), use acronym

Browse Source 
Most other PCI ID macros use platform acronyms. Follow suit for ILK. Add
INTEL_ILK_IDS() to identify all ILKs.

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/27ada56363cfa6a5b093cb31908a4b89aa912621.1715340032.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2024-05-10 14:22:15 +03:00
parent 432ed92bfb
commit 41c0f8a36f
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/early-quirks.c
View File

@ -533,8 +533,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
INTEL_I965GM_IDS(&gen3_early_ops),
INTEL_GM45_IDS(&gen3_early_ops),
INTEL_G45_IDS(&gen3_early_ops),
INTEL_IRONLAKE_D_IDS(&gen3_early_ops),
INTEL_IRONLAKE_M_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_IVB_M_IDS(&gen6_early_ops),

4
drivers/gpu/drm/i915/display/intel_display_device.c
View File

@ -816,8 +816,8 @@ static const struct {
INTEL_GM45_IDS(&gm45_display),
INTEL_G45_IDS(&g45_display),
INTEL_PNV_IDS(&pnv_display),
INTEL_IRONLAKE_D_IDS(&ilk_d_display),
INTEL_IRONLAKE_M_IDS(&ilk_m_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_IVB_M_IDS(&ivb_display),

4
drivers/gpu/drm/i915/i915_pci.c
View File

@ -812,8 +812,8 @@ static const struct pci_device_id pciidlist[] = {
INTEL_G45_IDS(&g45_info),
INTEL_PNV_G_IDS(&pnv_g_info),
INTEL_PNV_M_IDS(&pnv_m_info),
INTEL_IRONLAKE_D_IDS(&ilk_d_info),
INTEL_IRONLAKE_M_IDS(&ilk_m_info),
INTEL_ILK_D_IDS(&ilk_d_info),
INTEL_ILK_M_IDS(&ilk_m_info),
INTEL_SNB_D_GT1_IDS(&snb_d_gt1_info),
INTEL_SNB_D_GT2_IDS(&snb_d_gt2_info),
INTEL_SNB_M_GT1_IDS(&snb_m_gt1_info),

8
include/drm/i915_pciids.h
View File

@ -118,12 +118,16 @@
INTEL_PNV_G_IDS(info), \
INTEL_PNV_M_IDS(info)
#define INTEL_IRONLAKE_D_IDS(info) \
#define INTEL_ILK_D_IDS(info) \
INTEL_VGA_DEVICE(0x0042, info)
#define INTEL_IRONLAKE_M_IDS(info) \
#define INTEL_ILK_M_IDS(info) \
INTEL_VGA_DEVICE(0x0046, info)
#define INTEL_ILK_IDS(info) \
INTEL_ILK_D_IDS(info), \
INTEL_ILK_M_IDS(info)
#define INTEL_SNB_D_GT1_IDS(info) \
INTEL_VGA_DEVICE(0x0102, info), \
INTEL_VGA_DEVICE(0x010A, info)