Commit 2e2e73fc authored by Joshua Aberback's avatar Joshua Aberback Committed by Alex Deucher
Browse files

drm/amd/display: Remove dependency on pipe->plane for immedaite flip status 



[Why]
dcn20_apply_ctx_for_surface can be called with 0 planes, which means we
should blank the display. In this case when we get down to
dcn20_setup_gsl_group_as_lock, pipe_ctx->plane_state is NULL, but we don't
check for it. However, this function is only called by
dcn20_pipe_control_lock, and in that function we alraedy have a local for
the immediate flip status, which is what we care about in the plane state.

[How]
 - pass in immediate flip status as parameter

Signed-off-by: default avatarJoshua Aberback <joshua.aberback@amd.com>
Reviewed-by: default avatarKrunoslav Kovac <Krunoslav.Kovac@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0ba37b20

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

+5 −4
Original line number Diff line number Diff line
@@ -1255,7 +1255,7 @@ static void dcn20_pipe_control_lock( 
	if (lock && pipe->bottom_pipe != NULL)

		if ((flip_immediate && pipe->stream_res.gsl_group == 0) ||

		    (!flip_immediate && pipe->stream_res.gsl_group > 0))

			dcn20_setup_gsl_group_as_lock(dc, pipe);

			dcn20_setup_gsl_group_as_lock(dc, pipe, flip_immediate);



	if (pipe->plane_state != NULL && pipe->plane_state->triplebuffer_flips) {

		if (lock)
@@ -1890,14 +1890,15 @@ static int find_free_gsl_group(const struct dc *dc) 
 */

void dcn20_setup_gsl_group_as_lock(

		const struct dc *dc,

		struct pipe_ctx *pipe_ctx)

		struct pipe_ctx *pipe_ctx,

		bool flip_immediate)

{

	struct gsl_params gsl;

	int group_idx;



	memset(&gsl, 0, sizeof(struct gsl_params));



	if (pipe_ctx->plane_state->flip_immediate) {

	if (flip_immediate) {

		/* return if group already assigned since GSL was set up

		 * for vsync flip, we would unassign so it can't be "left over"

		 */
@@ -1964,7 +1965,7 @@ void dcn20_setup_gsl_group_as_lock( 


		pipe_ctx->stream_res.tg->funcs->set_gsl_source_select(

			pipe_ctx->stream_res.tg, group_idx,

			pipe_ctx->plane_state->flip_immediate ? 4 : 0);

			flip_immediate ? 4 : 0);

	} else

		BREAK_TO_DEBUGGER();

}

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h

+2 −1
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ void dcn20_program_tripleBuffer( 
void dcn20_setup_vupdate_interrupt(struct pipe_ctx *pipe_ctx);



void dcn20_setup_gsl_group_as_lock(const struct dc *dc,

				  struct pipe_ctx *pipe_ctx);

				  struct pipe_ctx *pipe_ctx,

				  bool flip_immediate);



#endif /* __DC_HWSS_DCN20_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE