From: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: michal.wajdeczko@intel.com, mallesh.koujalagi@intel.com,
Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
Subject: [PATCH v4 07/12] drm/xe/pat: Return error from xe_pat_init_early() on unknown platform
Date: Mon, 28 Sep 2026 14:51:09 +0530 [thread overview]
Message-ID: <20260928092114.1610203-8-dnyaneshwar.bhadane@intel.com> (raw)
In-Reply-To: <20260928092114.1610203-1-dnyaneshwar.bhadane@intel.com>
xe_pat_init_early() currently only logs an error when the platform's
graphics version doesn't match any known PAT table, but continues
probing with an uninitialized pat.ops. This can lead to a NULL
pointer dereference later when pat.ops is used.
Change xe_pat_init_early() to return an int and propagate -ENODATA
to xe_device_probe() so the driver fails to load cleanly instead of
continuing in a broken state.
Fixes: 152d7f2db978 ("drm/xe/pat: Handle unicast vs MCR PAT registers")
Signed-off-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
---
v2:
- Update kernel-doc for xe_pat_init_early. (Michal)
---
---
drivers/gpu/drm/xe/xe_device.c | 4 +++-
drivers/gpu/drm/xe/xe_pat.c | 13 ++++++++++++-
drivers/gpu/drm/xe/xe_pat.h | 4 +++-
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 44975e7823be..327f018fe15e 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -879,7 +879,9 @@ int xe_device_probe(struct xe_device *xe)
int err;
u8 id;
- xe_pat_init_early(xe);
+ err = xe_pat_init_early(xe);
+ if (err)
+ return err;
err = xe_sriov_init(xe);
if (err)
diff --git a/drivers/gpu/drm/xe/xe_pat.c b/drivers/gpu/drm/xe/xe_pat.c
index a5fe1beec652..519f7d5a2765 100644
--- a/drivers/gpu/drm/xe/xe_pat.c
+++ b/drivers/gpu/drm/xe/xe_pat.c
@@ -590,7 +590,13 @@ static const struct xe_pat_ops xe3p_xpc_pat_ops = {
.entry_dump = xe3p_xpc_pat_entry_dump,
};
-void xe_pat_init_early(struct xe_device *xe)
+/**
+ * xe_pat_init_early() - Init early pat table operation.
+ * @xe: the &xe_device
+ *
+ * Return: 0 on success or a negative error code on failure.
+ */
+int xe_pat_init_early(struct xe_device *xe)
{
xe->pat.idx[XE_CACHE_WB_COMPRESSION] = XE_PAT_INVALID_IDX;
xe->pat.idx[XE_CACHE_NONE_COMPRESSION] = XE_PAT_INVALID_IDX;
@@ -686,14 +692,19 @@ void xe_pat_init_early(struct xe_device *xe)
* raise an error rather than trying to silently inherit the
* most recent platform's behavior.
*/
+
drm_err(&xe->drm, "Missing PAT table for platform with graphics version %d.%02d!\n",
GRAPHICS_VER(xe), GRAPHICS_VERx100(xe) % 100);
+ return -ENODATA;
+
}
+ xe_assert(xe, xe->pat.ops);
xe_assert(xe, xe->pat.ops->dump);
xe_assert(xe, xe->pat.ops->program_graphics);
xe_assert(xe, MEDIA_VER(xe) < 13 || xe->pat.ops->program_media);
xe_assert(xe, GRAPHICS_VER(xe) < 20 || xe->pat.ops->entry_dump);
+ return 0;
}
void xe_pat_init(struct xe_gt *gt)
diff --git a/drivers/gpu/drm/xe/xe_pat.h b/drivers/gpu/drm/xe/xe_pat.h
index 7060f66e1d63..6398c3ab4805 100644
--- a/drivers/gpu/drm/xe/xe_pat.h
+++ b/drivers/gpu/drm/xe/xe_pat.h
@@ -42,8 +42,10 @@ struct xe_pat_table_entry {
/**
* xe_pat_init_early - SW initialization, setting up data based on device
* @xe: xe device
+ *
+ * Return: 0 on success or a negative error code on failure.
*/
-void xe_pat_init_early(struct xe_device *xe);
+int xe_pat_init_early(struct xe_device *xe);
/**
* xe_pat_init - Program HW PAT table
--
2.54.0
next prev parent reply other threads:[~2026-09-28 9:24 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-28 9:21 [PATCH v4 00/12] drm/xe: Convert IO_BUS errors to structured xe_log API Dnyaneshwar Bhadane
2026-09-28 9:21 ` [PATCH v4 01/12] drm/xe/log: Add VRAM, PAT, and HWMON DRIVER_HARDWARE components Dnyaneshwar Bhadane
2026-09-28 9:21 ` [PATCH v4 02/12] drm/xe/ggtt: Report GGTT errors using structured logging Dnyaneshwar Bhadane
2026-09-29 5:15 ` Mallesh, Koujalagi
2026-09-28 9:21 ` [PATCH v4 03/12] drm/xe/hwmon: Report errors using structured xe_log API Dnyaneshwar Bhadane
2026-09-29 5:25 ` Mallesh, Koujalagi
2026-09-28 9:21 ` [PATCH v4 04/12] drm/xe/mmio: Report BAR mapping " Dnyaneshwar Bhadane
2026-09-29 5:34 ` Mallesh, Koujalagi
2026-10-01 9:50 ` Dnyaneshwar Bhadane
2026-09-28 9:21 ` [PATCH v4 05/12] drm/xe/memirq: Report " Dnyaneshwar Bhadane
2026-09-28 9:30 ` sashiko-bot
2026-09-28 12:32 ` Bhadane, Dnyaneshwar
2026-09-29 5:40 ` Mallesh, Koujalagi
2026-09-28 9:21 ` [PATCH v4 06/12] drm/xe/reg_sr: Report save-restore " Dnyaneshwar Bhadane
2026-09-28 9:31 ` sashiko-bot
2026-09-28 12:35 ` Bhadane, Dnyaneshwar
2026-09-28 9:21 ` Dnyaneshwar Bhadane [this message]
2026-09-29 5:58 ` [PATCH v4 07/12] drm/xe/pat: Return error from xe_pat_init_early() on unknown platform Mallesh, Koujalagi
2026-09-28 9:21 ` [PATCH v4 08/12] drm/xe/pat: Report missing PAT table using structured xe_log API Dnyaneshwar Bhadane
2026-09-28 9:21 ` [PATCH v4 09/12] drm/xe/pci: Report unknown GMDID versions " Dnyaneshwar Bhadane
2026-09-29 6:34 ` Mallesh, Koujalagi
2026-09-28 9:21 ` [PATCH v4 10/12] drm/xe/lmtt: Report invalidation errors " Dnyaneshwar Bhadane
2026-09-28 9:36 ` sashiko-bot
2026-09-29 4:51 ` Dnyaneshwar Bhadane
2026-09-29 4:52 ` Dnyaneshwar Bhadane
2026-09-30 8:36 ` Mallesh, Koujalagi
2026-09-28 9:21 ` [PATCH v4 11/12] drm/xe/vram: Report tile vs device VRAM visibility errors Dnyaneshwar Bhadane
2026-09-28 9:21 ` [PATCH v4 12/12] drm/xe/vram: Report VRAM errors using structured xe_log API Dnyaneshwar Bhadane
2026-09-28 9:33 ` sashiko-bot
2026-09-30 6:48 ` Mallesh, Koujalagi
2026-10-07 20:20 ` Dnyaneshwar Bhadane
2026-09-28 16:14 ` ✓ CI.KUnit: success for drm/xe: Convert IO_BUS errors to structured xe_log API (rev4) Patchwork
2026-09-28 16:53 ` ✓ Xe.CI.BAT: " Patchwork
2026-09-28 20:42 ` ✗ Xe.CI.FULL: failure " 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=20260928092114.1610203-8-dnyaneshwar.bhadane@intel.com \
--to=dnyaneshwar.bhadane@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=mallesh.koujalagi@intel.com \
--cc=michal.wajdeczko@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