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

drm/amd/display: Fix SubVP way calculation 



[Why and How]
- Don't skip bottom and next odm pipe when calculating
  num ways for subvp
- Don't need to double cache lines for DCC (divide by 256)

Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarWayne Lin <wayne.lin@amd.com>
Signed-off-by: default avatarAlvin Lee <Alvin.Lee2@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b0f5b100

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

+7 −4
Original line number Diff line number Diff line
@@ -66,8 +66,11 @@ uint32_t dcn32_helper_calculate_num_ways_for_subvp(struct dc *dc, struct dc_stat 
	for (i = 0; i < dc->res_pool->pipe_count; i++) {

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



		// Find the phantom pipes

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

		/* Find the phantom pipes.

		 * - For pipe split case we need to loop through the bottom and next ODM

		 *   pipes or only half the viewport size is counted

		 */

		if (pipe->stream && pipe->plane_state &&

				pipe->stream->mall_stream_config.type == SUBVP_PHANTOM) {

			struct pipe_ctx *main_pipe = NULL;
@@ -118,9 +121,9 @@ uint32_t dcn32_helper_calculate_num_ways_for_subvp(struct dc *dc, struct dc_stat 
			// (MALL is 64-byte aligned)

			cache_lines_per_plane = bytes_in_mall / dc->caps.cache_line_size + 2;



			// For DCC we must cache the meat surface, so double cache lines required

			/* For DCC divide by 256 */

			if (pipe->plane_state->dcc.enable)

				cache_lines_per_plane *= 2;

				cache_lines_per_plane = cache_lines_per_plane + (cache_lines_per_plane / 256) + 1;

			cache_lines_used += cache_lines_per_plane;

		}

	}