From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com, Bjorn Helgaas <bhelgaas@google.com>,
linux-pci@vger.kernel.org
Subject: [PATCH 1/8] drm/i915/pciids: add INTEL_PNV_IDS(), use acronym
Date: Fri, 10 May 2024 14:22:14 +0300 [thread overview]
Message-ID: <5f9b34a2cd388244be03263a5147776bfe64d5ac.1715340032.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1715340032.git.jani.nikula@intel.com>
Most other PCI ID macros use platform acronyms. Follow suit for PNV. Add
INTEL_PNV_IDS() to identify all PNVs.
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 +--
drivers/gpu/drm/i915/i915_pci.c | 4 ++--
include/drm/i915_pciids.h | 8 ++++++--
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 59f4aefc6bc1..f50394a00fca 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -527,8 +527,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
INTEL_I945G_IDS(&gen3_early_ops),
INTEL_I945GM_IDS(&gen3_early_ops),
INTEL_VLV_IDS(&gen6_early_ops),
- INTEL_PINEVIEW_G_IDS(&gen3_early_ops),
- INTEL_PINEVIEW_M_IDS(&gen3_early_ops),
+ INTEL_PNV_IDS(&gen3_early_ops),
INTEL_I965G_IDS(&gen3_early_ops),
INTEL_G33_IDS(&gen3_early_ops),
INTEL_I965GM_IDS(&gen3_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 56a2e17d7d9e..0e0f5a36507d 100644
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -815,8 +815,7 @@ static const struct {
INTEL_I965GM_IDS(&i965gm_display),
INTEL_GM45_IDS(&gm45_display),
INTEL_G45_IDS(&g45_display),
- INTEL_PINEVIEW_G_IDS(&pnv_display),
- INTEL_PINEVIEW_M_IDS(&pnv_display),
+ INTEL_PNV_IDS(&pnv_display),
INTEL_IRONLAKE_D_IDS(&ilk_d_display),
INTEL_IRONLAKE_M_IDS(&ilk_m_display),
INTEL_SNB_D_IDS(&snb_display),
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index b5a056c9cb79..aa8593d73198 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -810,8 +810,8 @@ static const struct pci_device_id pciidlist[] = {
INTEL_I965GM_IDS(&i965gm_info),
INTEL_GM45_IDS(&gm45_info),
INTEL_G45_IDS(&g45_info),
- INTEL_PINEVIEW_G_IDS(&pnv_g_info),
- INTEL_PINEVIEW_M_IDS(&pnv_m_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_SNB_D_GT1_IDS(&snb_d_gt1_info),
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 85ce33ad6e26..21942a3c823b 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -108,12 +108,16 @@
INTEL_VGA_DEVICE(0x2e42, info), /* B43_G */ \
INTEL_VGA_DEVICE(0x2e92, info) /* B43_G.1 */
-#define INTEL_PINEVIEW_G_IDS(info) \
+#define INTEL_PNV_G_IDS(info) \
INTEL_VGA_DEVICE(0xa001, info)
-#define INTEL_PINEVIEW_M_IDS(info) \
+#define INTEL_PNV_M_IDS(info) \
INTEL_VGA_DEVICE(0xa011, info)
+#define INTEL_PNV_IDS(info) \
+ INTEL_PNV_G_IDS(info), \
+ INTEL_PNV_M_IDS(info)
+
#define INTEL_IRONLAKE_D_IDS(info) \
INTEL_VGA_DEVICE(0x0042, info)
--
2.39.2
next parent reply other threads:[~2024-05-10 11:22 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1715340032.git.jani.nikula@intel.com>
2024-05-10 11:22 ` Jani Nikula [this message]
2024-05-10 13:31 ` [PATCH 1/8] drm/i915/pciids: add INTEL_PNV_IDS(), use acronym Rodrigo Vivi
2024-05-10 11:22 ` [PATCH 2/8] drm/i915/pciids: add INTEL_ILK_IDS(), " Jani Nikula
2024-05-10 13:31 ` Rodrigo Vivi
2024-05-10 11:22 ` [PATCH 3/8] drm/i915/pciids: add INTEL_SNB_IDS() Jani Nikula
2024-05-10 13:31 ` Rodrigo Vivi
2024-05-10 11:22 ` [PATCH 4/8] drm/i915/pciids: add INTEL_IVB_IDS() Jani Nikula
2024-05-10 13:31 ` Rodrigo Vivi
2024-05-10 11:22 ` [PATCH 5/8] drm/i915/pciids: don't include WHL/CML PCI IDs in CFL Jani Nikula
2024-05-10 13:32 ` Rodrigo Vivi
2024-05-10 11:22 ` [PATCH 6/8] drm/i915/pciids: remove 11 from INTEL_ICL_IDS() Jani Nikula
2024-05-10 13:32 ` Rodrigo Vivi
2024-05-10 11:22 ` [PATCH 7/8] drm/i915/pciids: remove 12 from INTEL_TGL_IDS() Jani Nikula
2024-05-10 13:33 ` Rodrigo Vivi
2024-05-10 11:22 ` [PATCH 8/8] drm/i915/pciids: don't include RPL-U PCI IDs in RPL-P Jani Nikula
2024-05-10 13:55 ` [PATCH 0/8] drm/i915/pciids: PCI ID macro cleanups Jani Nikula
2024-05-15 14:25 ` Jani Nikula
2024-05-15 22:13 ` Dave Hansen
2024-05-16 8:20 ` Jani Nikula
2024-05-15 15:45 ` Bjorn Helgaas
2024-05-15 16:32 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5f9b34a2cd388244be03263a5147776bfe64d5ac.1715340032.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=bhelgaas@google.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-pci@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).