aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTvrtko Ursulin <[email protected]>2024-02-19 13:14:23 +0000
committerMaxime Ripard <[email protected]>2024-02-22 18:50:06 +0100
commit32ca5ebfde9a0deb50cedfa37646f86bb319542b (patch)
treeab87741cbb1f93dfd0b1f7dc0d77b8496d776316
parenta3baaca4a8766e9386e472d97315e5c131beb87d (diff)
drm/i915: Fix possible null pointer dereference after drm_dbg_printer conversion
Request can be NULL if no guilty request was identified so simply use engine->i915 instead. Signed-off-by: Tvrtko Ursulin <[email protected]> Fixes: d50892a9554c ("drm/i915: switch from drm_debug_printer() to device specific drm_dbg_printer()") Reported-by: Dan Carpenter <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Luca Coelho <[email protected]> Cc: Maxime Ripard <[email protected]> Cc: Jani Nikula <[email protected]> Acked-by: Rodrigo Vivi <[email protected]> Reviewed-by: Rodrigo Vivi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Maxime Ripard <[email protected]>
-rw-r--r--drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
index 0f6406f0cca0..1247cc418a1c 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
@@ -96,8 +96,8 @@ static void heartbeat_commit(struct i915_request *rq,
static void show_heartbeat(const struct i915_request *rq,
struct intel_engine_cs *engine)
{
- struct drm_printer p = drm_dbg_printer(&rq->i915->drm, DRM_UT_DRIVER,
- "heartbeat");
+ struct drm_printer p =
+ drm_dbg_printer(&engine->i915->drm, DRM_UT_DRIVER, "heartbeat");
if (!rq) {
intel_engine_dump(engine, &p,