From: Jani Nikula <jani.nikula@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: jani.nikula@intel.com, daniele.ceraolospurio@intel.com,
lucas.demarchi@intel.com, thomas.hellstrom@linux.intel.com,
rodrigo.vivi@intel.com
Subject: [PATCH 1/3] [topic/xe-for-CI] Revert "drm/xe: Add PVC's PCI device IDs"
Date: Fri, 6 Sep 2024 15:06:02 +0300 [thread overview]
Message-ID: <651475e5d6464fa4fbb17bc4fc4ac2ff4ec4e64c.1725624296.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1725624296.git.jani.nikula@intel.com>
This reverts commit 3fa91a6b5e41017e82b07ae5522baa9792e808ab.
It only existis in topic/xe-for-CI. Remove it from there.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/xe/xe_pci.c | 3 +--
include/drm/intel/xe_pciids.h | 16 ----------------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index c05ca61787be..2c9f9dc783d9 100644
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -323,7 +323,7 @@ static const struct xe_device_desc dg2_desc = {
.has_display = true,
};
-static const struct xe_device_desc pvc_desc = {
+static const __maybe_unused struct xe_device_desc pvc_desc = {
.graphics = &graphics_xehpc,
DGFX_FEATURES,
PLATFORM(PVC),
@@ -392,7 +392,6 @@ static const struct pci_device_id pciidlist[] = {
XE_DG1_IDS(INTEL_VGA_DEVICE, &dg1_desc),
XE_ATS_M_IDS(INTEL_VGA_DEVICE, &ats_m_desc),
XE_DG2_IDS(INTEL_VGA_DEVICE, &dg2_desc),
- XE_PVC_IDS(INTEL_VGA_DEVICE, &pvc_desc),
XE_MTL_IDS(INTEL_VGA_DEVICE, &mtl_desc),
XE_LNL_IDS(INTEL_VGA_DEVICE, &lnl_desc),
XE_BMG_IDS(INTEL_VGA_DEVICE, &bmg_desc),
diff --git a/include/drm/intel/xe_pciids.h b/include/drm/intel/xe_pciids.h
index 73d972a8aca1..644872a35c35 100644
--- a/include/drm/intel/xe_pciids.h
+++ b/include/drm/intel/xe_pciids.h
@@ -187,22 +187,6 @@
MACRO__(0x7DD1, ## __VA_ARGS__), \
MACRO__(0x7DD5, ## __VA_ARGS__)
-/* PVC */
-#define XE_PVC_IDS(MACRO__, ...) \
- MACRO__(0x0B69, ## __VA_ARGS__), \
- MACRO__(0x0B6E, ## __VA_ARGS__), \
- MACRO__(0x0BD4, ## __VA_ARGS__), \
- MACRO__(0x0BD5, ## __VA_ARGS__), \
- MACRO__(0x0BD6, ## __VA_ARGS__), \
- MACRO__(0x0BD7, ## __VA_ARGS__), \
- MACRO__(0x0BD8, ## __VA_ARGS__), \
- MACRO__(0x0BD9, ## __VA_ARGS__), \
- MACRO__(0x0BDA, ## __VA_ARGS__), \
- MACRO__(0x0BDB, ## __VA_ARGS__), \
- MACRO__(0x0BE0, ## __VA_ARGS__), \
- MACRO__(0x0BE1, ## __VA_ARGS__), \
- MACRO__(0x0BE5, ## __VA_ARGS__)
-
#define XE_LNL_IDS(MACRO__, ...) \
MACRO__(0x6420, ## __VA_ARGS__), \
MACRO__(0x64A0, ## __VA_ARGS__), \
--
2.39.2
next prev parent reply other threads:[~2024-09-06 12:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-06 12:06 [PATCH 0/3] drm/xe: split PVC PCI ID commit to two Jani Nikula
2024-09-06 12:06 ` Jani Nikula [this message]
2024-09-06 12:06 ` [PATCH 2/3] drm/xe/pciids: Add PVC's PCI device ID macros Jani Nikula
2024-09-06 15:59 ` Rodrigo Vivi
2024-09-19 11:55 ` Jani Nikula
2024-09-19 13:07 ` Lucas De Marchi
2024-09-23 9:37 ` Jani Nikula
2024-09-06 12:06 ` [PATCH 3/3] drm/xe: Add PVC's PCI device IDs Jani Nikula
2024-09-06 12:12 ` ✓ CI.Patch_applied: success for drm/xe: split PVC PCI ID commit to two Patchwork
2024-09-06 12:13 ` ✗ CI.checkpatch: warning " Patchwork
2024-09-06 12:15 ` ✓ CI.KUnit: success " Patchwork
2024-09-06 12:27 ` ✓ CI.Build: " Patchwork
2024-09-06 12:29 ` ✓ CI.Hooks: " Patchwork
2024-09-06 12:30 ` ✓ CI.checksparse: " Patchwork
2024-09-06 13:09 ` ✓ CI.BAT: " Patchwork
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=651475e5d6464fa4fbb17bc4fc4ac2ff4ec4e64c.1725624296.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=daniele.ceraolospurio@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=lucas.demarchi@intel.com \
--cc=rodrigo.vivi@intel.com \
--cc=thomas.hellstrom@linux.intel.com \
/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