Commit b6dbb8ff authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Alex Deucher
Browse files

drm/amd/display: Avoid pipe split when plane is too small 



[Why]
The minimum plane size we can support in DML is 16x16. If we try to pass
a 16x16 plane with dynamic pipe split then validation will fail since it
tries to split it into two pipes, each 8x8.

Some userspace doesn't check that the commit fails and because the
commit fails the old state is retained, resulting in corruption.

[How]
Add a workaround to avoid pipe split if any plane is 16x16 or smaller.

Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 63731e73

drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c

+20 −1
Original line number Diff line number Diff line
@@ -690,6 +690,26 @@ static void hack_bounding_box(struct dcn_bw_internal_vars *v, 
		struct dc_debug_options *dbg,

		struct dc_state *context)

{

	int i;



	for (i = 0; i < MAX_PIPES; i++) {

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



		/**

		 * Workaround for avoiding pipe-split in cases where we'd split

		 * planes that are too small, resulting in splits that aren't

		 * valid for the scaler.

		 */

		if (pipe->plane_state &&

		    (pipe->plane_state->dst_rect.width <= 16 ||

		     pipe->plane_state->dst_rect.height <= 16 ||

		     pipe->plane_state->src_rect.width <= 16 ||

		     pipe->plane_state->src_rect.height <= 16)) {

			hack_disable_optional_pipe_split(v);

			return;

		}

	}



	if (dbg->pipe_split_policy == MPC_SPLIT_AVOID)

		hack_disable_optional_pipe_split(v);
@@ -702,7 +722,6 @@ static void hack_bounding_box(struct dcn_bw_internal_vars *v, 
		hack_force_pipe_split(v, context->streams[0]->timing.pix_clk_100hz);

}





unsigned int get_highest_allowed_voltage_level(uint32_t hw_internal_rev, uint32_t pci_revision_id)

{

	/* for low power RV2 variants, the highest voltage level we want is 0 */

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

+13 −1
Original line number Diff line number Diff line
@@ -2606,10 +2606,22 @@ int dcn20_validate_apply_pipe_split_flags( 
	} else if (dc->debug.force_single_disp_pipe_split)

			force_split = true;



	/* TODO: fix dc bugs and remove this split threshold thing */

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

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



		/**

		 * Workaround for avoiding pipe-split in cases where we'd split

		 * planes that are too small, resulting in splits that aren't

		 * valid for the scaler.

		 */

		if (pipe->plane_state &&

		    (pipe->plane_state->dst_rect.width <= 16 ||

		     pipe->plane_state->dst_rect.height <= 16 ||

		     pipe->plane_state->src_rect.width <= 16 ||

		     pipe->plane_state->src_rect.height <= 16))

			avoid_split = true;



		/* TODO: fix dc bugs and remove this split threshold thing */

		if (pipe->stream && !pipe->prev_odm_pipe &&

				(!pipe->top_pipe || pipe->top_pipe->plane_state != pipe->plane_state))

			++plane_count;