drm/amd/display: Add HW cursor visual confirm

[WHY]
Added HW cursor visual confirm

[HOW]
Added visual confirm logic when programming cursor positions.
HW is programmed on cursor updates since cursor can change without flips.

Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Ryan Seto <ryanseto@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@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 9b24f448ce50c0f15bdfdb1c4af14761db8c2716..de0633f98158f405d02d484a04568b104fce411b 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -416,6 +416,35 @@ bool dc_stream_program_cursor_position(
                if (reset_idle_optimizations && !dc->debug.disable_dmub_reallow_idle)
                        dc_allow_idle_optimizations(dc, true);
 
+               /* apply/update visual confirm */
+               if (dc->debug.visual_confirm == VISUAL_CONFIRM_HW_CURSOR) {
+                       /* update software state */
+                       uint32_t color_value = MAX_TG_COLOR_VALUE;
+                       int i;
+
+                       for (i = 0; i < dc->res_pool->pipe_count; i++) {
+                               struct pipe_ctx *pipe_ctx = &dc->current_state->res_ctx.pipe_ctx[i];
+
+                               /* adjust visual confirm color for all pipes with current stream */
+                               if (stream == pipe_ctx->stream) {
+                                       if (stream->cursor_position.enable) {
+                                               pipe_ctx->visual_confirm_color.color_r_cr = color_value;
+                                               pipe_ctx->visual_confirm_color.color_g_y = 0;
+                                               pipe_ctx->visual_confirm_color.color_b_cb = 0;
+                                       } else {
+                                               pipe_ctx->visual_confirm_color.color_r_cr = 0;
+                                               pipe_ctx->visual_confirm_color.color_g_y = 0;
+                                               pipe_ctx->visual_confirm_color.color_b_cb = color_value;
+                                       }
+
+                                       /* programming hardware */
+                                       if (pipe_ctx->plane_state)
+                                               dc->hwss.update_visual_confirm_color(dc, pipe_ctx,
+                                                               pipe_ctx->plane_res.hubp->mpcc_id);
+                               }
+                       }
+               }
+
                return true;
        }
 

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index e0334b573f2dfaeef06be565a1f7b5b546fe1994..64241de70f15e18b686476426848f863430358a5 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -476,6 +476,7 @@ enum visual_confirm {
        VISUAL_CONFIRM_SUBVP = 14,
        VISUAL_CONFIRM_MCLK_SWITCH = 16,
        VISUAL_CONFIRM_FAMS2 = 19,
+       VISUAL_CONFIRM_HW_CURSOR = 20,
 };
 
 enum dc_psr_power_opts {