aboutsummaryrefslogtreecommitdiffstats
diff options
authorDave Stevenson <dave.stevenson@raspberrypi.com>2024-10-08 17:44:35 +0100
committerDave Stevenson <dave.stevenson@raspberrypi.com>2024-10-09 12:10:19 +0100
commit6b0bd1b02ea24b10522c92b2503981970b26d1a2 (patch)
tree5419b8c1d7f32ee68567703b2315d15ead717d3f
parentcf1c87d978d47339a39bfa7a6133ecd3f8f87525 (diff)
downloadlinux-6b0bd1b02ea24b10522c92b2503981970b26d1a2.tar.gz
drm/vc4: Match drm_dev_enter and exit calls in vc4_hvs_atomic_flush
Commit 92c17d16476c ("drm/vc4: hvs: Ignore atomic_flush if we're disabled") added a path which returned early without having called drm_dev_exit. Ensure all paths call drm_dev_exit. Fixes: 92c17d16476c ("drm/vc4: hvs: Ignore atomic_flush if we're disabled") Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: MaĆ­ra Canal <mcanal@igalia.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241008-drm-vc4-fixes-v1-2-9d0396ca9f42@raspberrypi.com Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-rw-r--r--drivers/gpu/drm/vc4/vc4_hvs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
index 546ee11016b29f..c5ebc317188a09 100644
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
@@ -603,7 +603,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
}
if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED)
- return;
+ goto exit;
if (debug_dump_regs) {
DRM_INFO("CRTC %d HVS before:\n", drm_crtc_index(crtc));
@@ -686,6 +686,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
vc4_hvs_dump_state(hvs);
}
+exit:
drm_dev_exit(idx);
}