]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm: xlnx: zynqmp_dpsub: Enable plane in atomic update
authorAnatoliy Klymenko <anatoliy.klymenko@amd.com>
Thu, 23 May 2024 23:49:28 +0000 (16:49 -0700)
committerTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Mon, 17 Jun 2024 07:37:14 +0000 (10:37 +0300)
Unconditionally enable the DPSUB layer in the corresponding atomic plane
update callback. Setting the new display mode may require disabling and
re-enabling the CRTC. This effectively resets DPSUB to the default state
with all layers disabled. The original implementation of the plane atomic
update enables the corresponding DPSUB layer only if the framebuffer
format has changed. This would leave the layer disabled after switching to
a different display mode with the same framebuffer format.

Signed-off-by: Anatoliy Klymenko <anatoliy.klymenko@amd.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240523-dp-layer-enable-v2-1-d799020098fc@amd.com
drivers/gpu/drm/xlnx/zynqmp_kms.c

index 43bf416b33d5c7bc470a0a6dcad10a16e5c271d5..0b57ab5451a9bfecdbde18bd98093072201fa121 100644 (file)
@@ -120,9 +120,13 @@ static void zynqmp_dpsub_plane_atomic_update(struct drm_plane *plane,
                zynqmp_disp_blend_set_global_alpha(dpsub->disp, true,
                                                   plane->state->alpha >> 8);
 
-       /* Enable or re-enable the plane if the format has changed. */
-       if (format_changed)
-               zynqmp_disp_layer_enable(layer);
+       /*
+        * Unconditionally enable the layer, as it may have been disabled
+        * previously either explicitly to reconfigure layer format, or
+        * implicitly after DPSUB reset during display mode change. DRM
+        * framework calls this callback for enabled planes only.
+        */
+       zynqmp_disp_layer_enable(layer);
 }
 
 static const struct drm_plane_helper_funcs zynqmp_dpsub_plane_helper_funcs = {