Commit e0adbe73 authored by Paul Hsieh's avatar Paul Hsieh Committed by Alex Deucher
Browse files

drm/amd/display: lock/un-lock cursor if odm pipe split used 



[Why]
When system resume from sleep, the cursor lock will be reset
to default(lock status). And the cursor programming sequence
doesn't consider about odm pipe split cause cursor can't be
enabled.

[How]
If odm pipe split has been used, lock/un-lock on each pipes.

Reviewed-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: default avatarSolomon Chiu <solomon.chiu@amd.com>
Signed-off-by: default avatarPaul Hsieh <paul.hsieh@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f11d9373

drivers/gpu/drm/amd/display/dc/core/dc_stream.c

+6 −1
Original line number Diff line number Diff line
@@ -273,6 +273,8 @@ static void program_cursor_attributes( 
		if (!pipe_to_program) {

			pipe_to_program = pipe_ctx;

			dc->hwss.cursor_lock(dc, pipe_to_program, true);

			if (pipe_to_program->next_odm_pipe)

				dc->hwss.cursor_lock(dc, pipe_to_program->next_odm_pipe, true);

		}



		dc->hwss.set_cursor_attribute(pipe_ctx);
@@ -280,8 +282,11 @@ static void program_cursor_attributes( 
			dc->hwss.set_cursor_sdr_white_level(pipe_ctx);

	}



	if (pipe_to_program)

	if (pipe_to_program) {

		dc->hwss.cursor_lock(dc, pipe_to_program, false);

		if (pipe_to_program->next_odm_pipe)

			dc->hwss.cursor_lock(dc, pipe_to_program->next_odm_pipe, false);

	}

}



#ifndef TRIM_FSFT