diff options
author | Maxime Ripard <maxime@cerno.tech> | 2022-12-07 14:53:19 +0300 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2023-01-09 17:21:31 +0300 |
commit | 92c17d16476c71329a2978f80f23ce1009c69c55 (patch) | |
tree | 7985ba3e0dfc0c738d1c53900e2340dbe835279d /drivers/gpu/drm/vc4/vc4_hvs.c | |
parent | f92534ea5cb1e5485218c0ed7cc5d588e28e668e (diff) | |
download | linux-92c17d16476c71329a2978f80f23ce1009c69c55.tar.xz |
drm/vc4: hvs: Ignore atomic_flush if we're disabled
atomic_flush will be called for each CRTC even if they aren't enabled.
The whole code we have there will thus run without a properly affected
channel, which can then result in all sorts of weird behaviour.
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://lore.kernel.org/r/20221207-rpi-hvs-crtc-misc-v1-8-1f8e0770798b@cerno.tech
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_hvs.c')
-rw-r--r-- | drivers/gpu/drm/vc4/vc4_hvs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c index 260efd44a821..4da66ef96783 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -579,6 +579,9 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc, return; } + if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED) + return; + if (debug_dump_regs) { DRM_INFO("CRTC %d HVS before:\n", drm_crtc_index(crtc)); vc4_hvs_dump_state(hvs); |