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

drm/amd/display: Change DET policy for MPO cases 



For MPO we want to allocate less than maximum DET for MPO pipes because
we need enogh buffer to move DET back to other pipes when removing an
MPO plane. Also update regular DET allocation to use DET override (DCN32
has an internal policy which driver does not want to use)

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 2b2b3a75

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

+21 −13
Original line number Diff line number Diff line
@@ -3045,31 +3045,35 @@ int dcn32_populate_dml_pipes_from_context( 
		pipe_cnt++;

	}



	/* For DET allocation, we don't want to use DML policy (not optimal for utilizing all

	 * the DET available for each pipe). Use the DET override input to maintain our driver

	 * policy.

	 */

	switch (pipe_cnt) {

	case 1:

		context->bw_ctx.dml.ip.det_buffer_size_kbytes = DCN3_2_MAX_DET_SIZE;

		pipes[0].pipe.src.det_size_override = DCN3_2_MAX_DET_SIZE;

		if (pipe->plane_state && !dc->debug.disable_z9_mpc) {

			if (!is_dual_plane(pipe->plane_state->format)) {

				context->bw_ctx.dml.ip.det_buffer_size_kbytes = DCN3_2_DEFAULT_DET_SIZE;

				pipes[0].pipe.src.det_size_override = DCN3_2_DEFAULT_DET_SIZE;

				pipes[0].pipe.src.unbounded_req_mode = true;

				if (pipe->plane_state->src_rect.width >= 5120 &&

					pipe->plane_state->src_rect.height >= 2880)

					context->bw_ctx.dml.ip.det_buffer_size_kbytes = 320; // 5K or higher

					pipes[0].pipe.src.det_size_override = 320; // 5K or higher

			}

		}

		break;

	case 2:

		context->bw_ctx.dml.ip.det_buffer_size_kbytes = DCN3_2_MAX_DET_SIZE / 2; // 576 KB (9 segments)

		break;

	case 3:

		context->bw_ctx.dml.ip.det_buffer_size_kbytes = DCN3_2_MAX_DET_SIZE / 3; // 384 KB (6 segments)

		break;

	case 4:

	default:

		context->bw_ctx.dml.ip.det_buffer_size_kbytes = DCN3_2_DEFAULT_DET_SIZE; // 256 KB (4 segments)

		// For 2 and 3 pipes, use (MAX_DET_SIZE / pipe_cnt), for 4 pipes use default size for each pipe

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

			pipes[i].pipe.src.det_size_override = (pipe_cnt < 4) ? (DCN3_2_MAX_DET_SIZE / pipe_cnt) : DCN3_2_DEFAULT_DET_SIZE;

		}

		break;

	}



	dcn32_update_det_override_for_mpo(dc, context, pipes);



	return pipe_cnt;

}
@@ -3365,8 +3369,8 @@ void dcn32_calculate_dlg_params(struct dc *dc, struct dc_state *context, display 
			context->res_ctx.pipe_ctx[i].det_buffer_size_kb = 0;

			context->res_ctx.pipe_ctx[i].unbounded_req = false;

		} else {

			context->res_ctx.pipe_ctx[i].det_buffer_size_kb =

					context->bw_ctx.dml.ip.det_buffer_size_kbytes;

			context->res_ctx.pipe_ctx[i].det_buffer_size_kb = get_det_buffer_size_kbytes(&context->bw_ctx.dml, pipes, pipe_cnt,

							pipe_idx);

			context->res_ctx.pipe_ctx[i].unbounded_req = pipes[pipe_idx].pipe.src.unbounded_req_mode;

		}

		if (context->bw_ctx.bw.dcn.clk.dppclk_khz < pipes[pipe_idx].clks_cfg.dppclk_mhz * 1000)
@@ -3383,8 +3387,12 @@ void dcn32_calculate_dlg_params(struct dc *dc, struct dc_state *context, display 
	context->bw_ctx.bw.dcn.clk.max_supported_dispclk_khz = context->bw_ctx.dml.soc.clock_limits[vlevel].dispclk_mhz

			* 1000;



	context->bw_ctx.bw.dcn.compbuf_size_kb = context->bw_ctx.dml.ip.config_return_buffer_size_in_kbytes

			- context->bw_ctx.dml.ip.det_buffer_size_kbytes * pipe_idx;

	context->bw_ctx.bw.dcn.compbuf_size_kb = context->bw_ctx.dml.ip.config_return_buffer_size_in_kbytes;



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

		if (context->res_ctx.pipe_ctx[i].stream)

			context->bw_ctx.bw.dcn.compbuf_size_kb -= context->res_ctx.pipe_ctx[i].det_buffer_size_kb;

	}



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

drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c

+1 −1
Original line number Diff line number Diff line
@@ -561,8 +561,8 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib) 
		mode_lib->vba.GPUVMMinPageSizeKBytes[mode_lib->vba.NumberOfActivePlanes] = src->gpuvm_min_page_size_kbytes;

		mode_lib->vba.RefreshRate[mode_lib->vba.NumberOfActivePlanes] = dst->refresh_rate; //todo remove this

		mode_lib->vba.OutputLinkDPRate[mode_lib->vba.NumberOfActivePlanes] = dout->dp_rate;



		mode_lib->vba.ODMUse[mode_lib->vba.NumberOfActivePlanes] = dst->odm_combine_policy;

		mode_lib->vba.DETSizeOverride[mode_lib->vba.NumberOfActivePlanes] = src->det_size_override;

		//TODO: Need to assign correct values to dp_multistream vars

		mode_lib->vba.OutputMultistreamEn[mode_lib->vba.NumberOfActiveSurfaces] = dout->dp_multistream_en;

		mode_lib->vba.OutputMultistreamId[mode_lib->vba.NumberOfActiveSurfaces] = dout->dp_multistream_id;