Commit d35e8b7a authored by Alvin Lee's avatar Alvin Lee Committed by Alex Deucher
Browse files

drm/amd/display: Block SubVP if rotation being used 



[Description]
- SubVP rotation support is not explicitly implemented,
  so block SubVP in rotation cases to avoid unexpected
  behaviors

Reviewed-by: default avatarNevenko Stupar <Nevenko.Stupar@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarAlvin Lee <Alvin.Lee2@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ab5220bb

drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ bool dcn32_subvp_in_use(struct dc *dc, 


bool dcn32_mpo_in_use(struct dc_state *context);



bool dcn32_any_surfaces_rotated(struct dc *dc, struct dc_state *context);



struct pipe_ctx *dcn32_acquire_idle_pipe_for_head_pipe_in_layer(

		struct dc_state *state,

		const struct resource_pool *pool,

drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c

+17 −0
Original line number Diff line number Diff line
@@ -233,6 +233,23 @@ bool dcn32_mpo_in_use(struct dc_state *context) 
	return false;

}





bool dcn32_any_surfaces_rotated(struct dc *dc, struct dc_state *context)

{

	uint32_t i;



	for (i = 0; i < dc->res_pool->pipe_count; i++) {

		struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];



		if (!pipe->stream)

			continue;



		if (pipe->plane_state && pipe->plane_state->rotation != ROTATION_ANGLE_0)

			return true;

	}

	return false;

}



/**

 * *******************************************************************************************

 * dcn32_determine_det_override: Determine DET allocation for each pipe

drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c

+2 −1
Original line number Diff line number Diff line
@@ -1115,7 +1115,8 @@ static void dcn32_full_validate_bw_helper(struct dc *dc, 
	 * 5. (Config doesn't support MCLK in VACTIVE/VBLANK || dc->debug.force_subvp_mclk_switch)

	 */

	if (!dc->debug.force_disable_subvp && dcn32_all_pipes_have_stream_and_plane(dc, context) &&

	    !dcn32_mpo_in_use(context) && (*vlevel == context->bw_ctx.dml.soc.num_states ||

	    !dcn32_mpo_in_use(context) && !dcn32_any_surfaces_rotated(dc, context) &&

		(*vlevel == context->bw_ctx.dml.soc.num_states ||

	    vba->DRAMClockChangeSupport[*vlevel][vba->maxMpcComb] == dm_dram_clock_change_unsupported ||

	    dc->debug.force_subvp_mclk_switch)) {