drm: xlnx: zynqmp_dpsub: Configure blender in zynqmp_disp_enable()

To prepare for control of the blender outside of the CRTC code, move the
setup of the blender to the zynqmp_disp_enable() function. This doesn't
introduce any functional change.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c
index 380540f..212f521 100644 (file)
--- a/drivers/gpu/drm/xlnx/zynqmp_disp.c
+++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c
@@ -1386,6 +1386,9 @@ err:
  */
 static void zynqmp_disp_enable(struct zynqmp_disp *disp)
 {
+       zynqmp_disp_blend_set_output_format(disp, ZYNQMP_DPSUB_FORMAT_RGB);
+       zynqmp_disp_blend_set_bg_color(disp, 0, 0, 0);
+
        zynqmp_disp_avbuf_enable(disp);
        /* Choose clock source based on the DT clock handle. */
        zynqmp_disp_avbuf_set_clocks_sources(disp, disp->pclk_from_ps,
@@ -1460,9 +1463,6 @@ zynqmp_disp_crtc_atomic_enable(struct drm_crtc *crtc,
                return;
        }
 
-       zynqmp_disp_blend_set_output_format(disp, ZYNQMP_DPSUB_FORMAT_RGB);
-       zynqmp_disp_blend_set_bg_color(disp, 0, 0, 0);
-
        zynqmp_disp_enable(disp);
 
        /* Delay of 3 vblank intervals for timing gen to be stable */