Commit e7f5f9d6 authored Apr 04, 2024 by Harry Wentland Committed by Alex Deucher Apr 30, 2024

drm/amd/display: Set cursor attributes before position



HWSS set_cursor_attributes copies the stream's cursor attributes
to the hubp cursor attributes. set_cursor_position might attempt
to program the cursor attributes but will program them wrong if
they're not set correctly. We need to call HWSS set_cursor_attributes
first to ensure hubp has the right attributes to be programmed.

Reviewed-by: Agustin Gutierrez <agustin.gutierrez@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent f63f86b5

drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2886,8 +2886,8 @@ static void dcn10_update_dchubp_dpp(
		}

		if (pipe_ctx->stream->cursor_attributes.address.quad_part != 0) {
		dc->hwss.set_cursor_position(pipe_ctx);
		dc->hwss.set_cursor_attribute(pipe_ctx);
		dc->hwss.set_cursor_position(pipe_ctx);

		if (dc->hwss.set_cursor_sdr_white_level)
		dc->hwss.set_cursor_sdr_white_level(pipe_ctx);

drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1759,8 +1759,8 @@ static void dcn20_update_dchubp_dpp(
		if ((pipe_ctx->update_flags.bits.enable \|\| pipe_ctx->update_flags.bits.opp_changed \|\|
		pipe_ctx->update_flags.bits.scaler \|\| viewport_changed == true) &&
		pipe_ctx->stream->cursor_attributes.address.quad_part != 0) {
		dc->hwss.set_cursor_position(pipe_ctx);
		dc->hwss.set_cursor_attribute(pipe_ctx);
		dc->hwss.set_cursor_position(pipe_ctx);

		if (dc->hwss.set_cursor_sdr_white_level)
		dc->hwss.set_cursor_sdr_white_level(pipe_ctx);