Commit 2ff6a14b authored by Robin Chen's avatar Robin Chen Committed by Alex Deucher
Browse files

drm/amd/display: refactor dirty rect dmub command decision 



[Why]
To wrap the decision logic of sending dirty rect dmub command
for both frame update and cursor update path.

Signed-off-by: default avatarRobin Chen <po-tchen@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f9f4daf1

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

+13 −1
Original line number Diff line number Diff line
@@ -2827,6 +2827,18 @@ static void commit_planes_do_stream_update(struct dc *dc, 
	}

}



static bool dc_dmub_should_send_dirty_rect_cmd(struct dc *dc, struct dc_stream_state *stream)

{

	if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_SU_1)

		return true;



	if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_1 &&

	    dc->debug.enable_sw_cntl_psr)

		return true;



	return false;

}



void dc_dmub_update_dirty_rect(struct dc *dc,

			       int surface_count,

			       struct dc_stream_state *stream,
@@ -2839,7 +2851,7 @@ void dc_dmub_update_dirty_rect(struct dc *dc, 
	unsigned int i, j;

	unsigned int panel_inst = 0;



	if (stream->link->psr_settings.psr_version != DC_PSR_VERSION_SU_1)

	if (!dc_dmub_should_send_dirty_rect_cmd(dc, stream))

		return;



	if (!dc_get_edp_link_panel_inst(dc, stream->link, &panel_inst))

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+18 −6
Original line number Diff line number Diff line
@@ -3330,6 +3330,23 @@ static bool dcn10_can_pipe_disable_cursor(struct pipe_ctx *pipe_ctx) 
	return false;

}



static bool dcn10_dmub_should_update_cursor_data(

		struct pipe_ctx *pipe_ctx,

		struct dc_debug_options *debug)

{

	if (pipe_ctx->plane_state->address.type == PLN_ADDR_TYPE_VIDEO_PROGRESSIVE)

		return false;



	if (pipe_ctx->stream->link->psr_settings.psr_version == DC_PSR_VERSION_SU_1)

		return true;



	if (pipe_ctx->stream->link->psr_settings.psr_version == DC_PSR_VERSION_1 &&

	    debug->enable_sw_cntl_psr)

		return true;



	return false;

}



static void dcn10_dmub_update_cursor_data(

		struct pipe_ctx *pipe_ctx,

		struct hubp *hubp,
@@ -3351,13 +3368,8 @@ static void dcn10_dmub_update_cursor_data( 


	struct dc_debug_options *debug = &hubp->ctx->dc->debug;



	if (!debug->enable_sw_cntl_psr && pipe_ctx->stream->link->psr_settings.psr_version != DC_PSR_VERSION_SU_1)

	if (!dcn10_dmub_should_update_cursor_data(pipe_ctx, debug))

		return;



	if (pipe_ctx->stream->link->psr_settings.psr_version == DC_PSR_VERSION_UNSUPPORTED ||

		pipe_ctx->plane_state->address.type == PLN_ADDR_TYPE_VIDEO_PROGRESSIVE)

		return;



	/**

	 * if cur_pos == NULL means the caller is from cursor_set_attribute

	 * then driver use previous cursor position data