drm/amd/display: to synchronize the hubp and dpp programming in cursor control

Signed-off-by: Martin Tsai <Martin.Tsai@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
index 3b2ddbd8c054c2caeb42483e0a27ecccef30a7f4..3732a1de9d6c2852f862dc14bbf1571ab7db2055 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -178,6 +178,7 @@ bool dc_stream_set_cursor_attributes(
        int i;
        struct dc  *core_dc;
        struct resource_context *res_ctx;
+       struct pipe_ctx *pipe_to_program = NULL;
 
        if (NULL == stream) {
                dm_error("DC: dc_stream is NULL!\n");
@@ -205,9 +206,17 @@ bool dc_stream_set_cursor_attributes(
                if (pipe_ctx->top_pipe && pipe_ctx->plane_state != pipe_ctx->top_pipe->plane_state)
                        continue;
 
+               if (!pipe_to_program) {
+                       pipe_to_program = pipe_ctx;
+                       core_dc->hwss.pipe_control_lock(core_dc, pipe_to_program, true);
+               }
 
                core_dc->hwss.set_cursor_attribute(pipe_ctx);
        }
+
+       if (pipe_to_program)
+               core_dc->hwss.pipe_control_lock(core_dc, pipe_to_program, false);
+
        return true;
 }
 
@@ -218,6 +227,7 @@ bool dc_stream_set_cursor_position(
        int i;
        struct dc  *core_dc;
        struct resource_context *res_ctx;
+       struct pipe_ctx *pipe_to_program = NULL;
 
        if (NULL == stream) {
                dm_error("DC: dc_stream is NULL!\n");
@@ -243,9 +253,17 @@ bool dc_stream_set_cursor_position(
                                !pipe_ctx->plane_res.ipp)
                        continue;
 
+               if (!pipe_to_program) {
+                       pipe_to_program = pipe_ctx;
+                       core_dc->hwss.pipe_control_lock(core_dc, pipe_to_program, true);
+               }
+
                core_dc->hwss.set_cursor_position(pipe_ctx);
        }
 
+       if (pipe_to_program)
+               core_dc->hwss.pipe_control_lock(core_dc, pipe_to_program, false);
+
        return true;
 }