diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-03-01 12:38:08 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-03-01 12:38:13 +0300 |
| commit | c6d6a82d8a9f8f9326b760accaa532b839b80140 (patch) | |
| tree | 96656bb5608a0c551f00f0704440d9f8264d45de /drivers/gpu/drm/i915 | |
| parent | ca66211a55b9e582a560b0f341dd9058cab78f39 (diff) | |
| parent | 9cb3542aeeac31b3dd6b5a7d58b9b7d6fe9fd2bc (diff) | |
| download | linux-c6d6a82d8a9f8f9326b760accaa532b839b80140.tar.xz | |
Merge tag 'drm-misc-next-fixes-2024-02-29' of https://anongit.freedesktop.org/git/drm/drm-misc into drm-next
Short summary of fixes pull:
i915:
- Fix NULL-pointer deref
imx:
- dcss: Fix resource-size calculation
firmware:
- sysfb: Fix returned error code
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240229085331.GA25863@localhost.localdomain
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 |
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 5f8d86e25993..8d4bb95f8424 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, |