Skip to content

Commit 6b0bd1b

Browse files
committed
drm/vc4: Match drm_dev_enter and exit calls in vc4_hvs_atomic_flush
Commit 92c17d1 ("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: 92c17d1 ("drm/vc4: hvs: Ignore atomic_flush if we're disabled") Tested-by: Marek Szyprowski <[email protected]> Reviewed-by: Maíra Canal <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Dave Stevenson <[email protected]>
1 parent cf1c87d commit 6b0bd1b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/vc4/vc4_hvs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
603603
}
604604

605605
if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED)
606-
return;
606+
goto exit;
607607

608608
if (debug_dump_regs) {
609609
DRM_INFO("CRTC %d HVS before:\n", drm_crtc_index(crtc));
@@ -686,6 +686,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
686686
vc4_hvs_dump_state(hvs);
687687
}
688688

689+
exit:
689690
drm_dev_exit(idx);
690691
}
691692

0 commit comments

Comments
 (0)