Commit 5fc11598 authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: expand dml structs 



Add more fields to support upcoming dml versions

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 09178aaa

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

+32 −3
Original line number Diff line number Diff line
@@ -1858,6 +1858,22 @@ void dcn20_populate_dml_writeback_from_context( 


}



static int get_num_odm_heads(struct pipe_ctx *pipe)

{

	int odm_head_count = 0;

	struct pipe_ctx *next_pipe = pipe->next_odm_pipe;

	while (next_pipe) {

		odm_head_count++;

		next_pipe = next_pipe->next_odm_pipe;

	}

	pipe = pipe->prev_odm_pipe;

	while (pipe) {

		odm_head_count++;

		pipe = pipe->prev_odm_pipe;

	}

	return odm_head_count ? odm_head_count + 1 : 0;

}



int dcn20_populate_dml_pipes_from_context(

		struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes)

{
@@ -1897,6 +1913,8 @@ int dcn20_populate_dml_pipes_from_context( 
		pipes[pipe_cnt].pipe.src.dcc = 0;

		pipes[pipe_cnt].pipe.src.vm = 0;*/



		pipes[pipe_cnt].clks_cfg.refclk_mhz = dc->res_pool->ref_clocks.dchub_ref_clock_inKhz / 1000.0;



		pipes[pipe_cnt].dout.dsc_enable = res_ctx->pipe_ctx[i].stream->timing.flags.DSC;

		/* todo: rotation?*/

		pipes[pipe_cnt].dout.dsc_slices = res_ctx->pipe_ctx[i].stream->timing.dsc_cfg.num_slices_h;
@@ -1935,8 +1953,13 @@ int dcn20_populate_dml_pipes_from_context( 
		pipes[pipe_cnt].dout.dp_lanes = 4;

		pipes[pipe_cnt].pipe.dest.vtotal_min = res_ctx->pipe_ctx[i].stream->adjust.v_total_min;

		pipes[pipe_cnt].pipe.dest.vtotal_max = res_ctx->pipe_ctx[i].stream->adjust.v_total_max;

		pipes[pipe_cnt].pipe.dest.odm_combine = res_ctx->pipe_ctx[i].prev_odm_pipe

							|| res_ctx->pipe_ctx[i].next_odm_pipe;

		switch (get_num_odm_heads(&res_ctx->pipe_ctx[i])) {

		case 2:

			pipes[pipe_cnt].pipe.dest.odm_combine = dm_odm_combine_mode_2to1;

			break;

		default:

			pipes[pipe_cnt].pipe.dest.odm_combine = dm_odm_combine_mode_disabled;

		}

		pipes[pipe_cnt].pipe.src.hsplit_grp = res_ctx->pipe_ctx[i].pipe_idx;

		if (res_ctx->pipe_ctx[i].top_pipe && res_ctx->pipe_ctx[i].top_pipe->plane_state

				== res_ctx->pipe_ctx[i].plane_state)
@@ -2046,6 +2069,9 @@ int dcn20_populate_dml_pipes_from_context( 
			if (pipes[pipe_cnt].pipe.src.viewport_height > 1080)

				pipes[pipe_cnt].pipe.src.viewport_height = 1080;

			pipes[pipe_cnt].pipe.src.surface_height_y = pipes[pipe_cnt].pipe.src.viewport_height;

			pipes[pipe_cnt].pipe.src.surface_width_y = pipes[pipe_cnt].pipe.src.viewport_width;

			pipes[pipe_cnt].pipe.src.surface_height_c = pipes[pipe_cnt].pipe.src.viewport_height;

			pipes[pipe_cnt].pipe.src.surface_width_c = pipes[pipe_cnt].pipe.src.viewport_width;

			pipes[pipe_cnt].pipe.src.data_pitch = ((pipes[pipe_cnt].pipe.src.viewport_width + 63) / 64) * 64; /* linear sw only */

			pipes[pipe_cnt].pipe.src.source_format = dm_444_32;

			pipes[pipe_cnt].pipe.dest.recout_width = pipes[pipe_cnt].pipe.src.viewport_width; /*vp_width/hratio*/
@@ -2079,7 +2105,10 @@ int dcn20_populate_dml_pipes_from_context( 
			pipes[pipe_cnt].pipe.src.viewport_width_c = scl->viewport_c.width;

			pipes[pipe_cnt].pipe.src.viewport_height = scl->viewport.height;

			pipes[pipe_cnt].pipe.src.viewport_height_c = scl->viewport_c.height;

			pipes[pipe_cnt].pipe.src.surface_width_y = pln->plane_size.surface_size.width;

			pipes[pipe_cnt].pipe.src.surface_height_y = pln->plane_size.surface_size.height;

			pipes[pipe_cnt].pipe.src.surface_width_c = pln->plane_size.chroma_size.width;

			pipes[pipe_cnt].pipe.src.surface_height_c = pln->plane_size.chroma_size.height;

			if (pln->format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) {

				pipes[pipe_cnt].pipe.src.data_pitch = pln->plane_size.surface_pitch;

				pipes[pipe_cnt].pipe.src.data_pitch_c = pln->plane_size.chroma_pitch;
@@ -2493,7 +2522,7 @@ int dcn20_validate_apply_pipe_split_flags( 
			split[i] = true;

		if (dc->debug.force_odm_combine & (1 << pipe->stream_res.tg->inst)) {

			split[i] = true;

			context->bw_ctx.dml.vba.ODMCombineEnablePerState[vlevel][pipe_idx] = true;

			context->bw_ctx.dml.vba.ODMCombineEnablePerState[vlevel][pipe_idx] = dm_odm_combine_mode_2to1;

		}

		context->bw_ctx.dml.vba.ODMCombineEnabled[pipe_idx] =

			context->bw_ctx.dml.vba.ODMCombineEnablePerState[vlevel][pipe_idx];

drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c

+82 −83

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c

+83 −84
Original line number Diff line number Diff line
@@ -1395,11 +1395,11 @@ static void dml20v2_DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndP 
		else

			mode_lib->vba.SwathWidthSingleDPPY[k] = mode_lib->vba.ViewportHeight[k];



		if (mode_lib->vba.ODMCombineEnabled[k] == true)

		if (mode_lib->vba.ODMCombineEnabled[k] == dm_odm_combine_mode_2to1)

			MainPlaneDoesODMCombine = true;

		for (j = 0; j < mode_lib->vba.NumberOfActivePlanes; ++j)

			if (mode_lib->vba.BlendingAndTiming[k] == j

					&& mode_lib->vba.ODMCombineEnabled[j] == true)

					&& mode_lib->vba.ODMCombineEnabled[k] == dm_odm_combine_mode_2to1)

				MainPlaneDoesODMCombine = true;



		if (MainPlaneDoesODMCombine == true)
@@ -2885,12 +2885,12 @@ static void dml20v2_DisplayPipeConfiguration(struct display_mode_lib *mode_lib) 
			SwathWidth = mode_lib->vba.ViewportHeight[k];

		}



		if (mode_lib->vba.ODMCombineEnabled[k] == true) {

		if (mode_lib->vba.ODMCombineEnabled[k] == dm_odm_combine_mode_2to1) {

			MainPlaneDoesODMCombine = true;

		}

		for (j = 0; j < mode_lib->vba.NumberOfActivePlanes; ++j) {

			if (mode_lib->vba.BlendingAndTiming[k] == j

					&& mode_lib->vba.ODMCombineEnabled[j] == true) {

					&& mode_lib->vba.ODMCombineEnabled[k] == dm_odm_combine_mode_2to1) {

				MainPlaneDoesODMCombine = true;

			}

		}
@@ -3483,10 +3483,10 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
				locals->FabricAndDRAMBandwidthPerState[i] * 1000)

				* locals->PercentOfIdealDRAMFabricAndSDPPortBWReceivedAfterUrgLatencyPixelDataOnly / 100;



		locals->ReturnBWPerState[i] = locals->ReturnBWToDCNPerState;

		locals->ReturnBWPerState[i][0] = locals->ReturnBWToDCNPerState;



		if (locals->DCCEnabledInAnyPlane == true && locals->ReturnBWToDCNPerState > locals->DCFCLKPerState[i] * locals->ReturnBusWidth / 4) {

			locals->ReturnBWPerState[i] = dml_min(locals->ReturnBWPerState[i],

			locals->ReturnBWPerState[i][0] = dml_min(locals->ReturnBWPerState[i][0],

					locals->ReturnBWToDCNPerState * 4 * (1 - locals->UrgentLatency /

					((locals->ROBBufferSizeInKByte - locals->PixelChunkSizeInKByte) * 1024

					/ (locals->ReturnBWToDCNPerState - locals->DCFCLKPerState[i]
@@ -3497,7 +3497,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
				+ (locals->ROBBufferSizeInKByte - locals->PixelChunkSizeInKByte) * 1024);



		if (locals->DCCEnabledInAnyPlane && locals->CriticalPoint > 1 && locals->CriticalPoint < 4) {

			locals->ReturnBWPerState[i] = dml_min(locals->ReturnBWPerState[i],

			locals->ReturnBWPerState[i][0] = dml_min(locals->ReturnBWPerState[i][0],

				4 * locals->ReturnBWToDCNPerState *

				(locals->ROBBufferSizeInKByte - locals->PixelChunkSizeInKByte) * 1024

				* locals->ReturnBusWidth * locals->DCFCLKPerState[i] * locals->UrgentLatency /
@@ -3509,7 +3509,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
				locals->DCFCLKPerState[i], locals->FabricAndDRAMBandwidthPerState[i] * 1000);



		if (locals->DCCEnabledInAnyPlane == true && locals->ReturnBWToDCNPerState > locals->DCFCLKPerState[i] * locals->ReturnBusWidth / 4) {

			locals->ReturnBWPerState[i] = dml_min(locals->ReturnBWPerState[i],

			locals->ReturnBWPerState[i][0] = dml_min(locals->ReturnBWPerState[i][0],

					locals->ReturnBWToDCNPerState * 4 * (1 - locals->UrgentLatency /

					((locals->ROBBufferSizeInKByte - locals->PixelChunkSizeInKByte) * 1024

					/ (locals->ReturnBWToDCNPerState - locals->DCFCLKPerState[i]
@@ -3520,7 +3520,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
				+ (locals->ROBBufferSizeInKByte - locals->PixelChunkSizeInKByte) * 1024);



		if (locals->DCCEnabledInAnyPlane && locals->CriticalPoint > 1 && locals->CriticalPoint < 4) {

			locals->ReturnBWPerState[i] = dml_min(locals->ReturnBWPerState[i],

			locals->ReturnBWPerState[i][0] = dml_min(locals->ReturnBWPerState[i][0],

				4 * locals->ReturnBWToDCNPerState *

				(locals->ROBBufferSizeInKByte - locals->PixelChunkSizeInKByte) * 1024

				* locals->ReturnBusWidth * locals->DCFCLKPerState[i] * locals->UrgentLatency /
@@ -3558,12 +3558,12 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
	for (i = 0; i <= mode_lib->vba.soc.num_states; i++) {

		locals->UrgentRoundTripAndOutOfOrderLatencyPerState[i] =

				(mode_lib->vba.RoundTripPingLatencyCycles + 32.0) / mode_lib->vba.DCFCLKPerState[i]

				+ locals->UrgentOutOfOrderReturnPerChannel * mode_lib->vba.NumberOfChannels / locals->ReturnBWPerState[i];

		if ((mode_lib->vba.ROBBufferSizeInKByte - mode_lib->vba.PixelChunkSizeInKByte) * 1024.0 / locals->ReturnBWPerState[i]

				+ locals->UrgentOutOfOrderReturnPerChannel * mode_lib->vba.NumberOfChannels / locals->ReturnBWPerState[i][0];

		if ((mode_lib->vba.ROBBufferSizeInKByte - mode_lib->vba.PixelChunkSizeInKByte) * 1024.0 / locals->ReturnBWPerState[i][0]

				> locals->UrgentRoundTripAndOutOfOrderLatencyPerState[i]) {

			locals->ROBSupport[i] = true;

			locals->ROBSupport[i][0] = true;

		} else {

			locals->ROBSupport[i] = false;

			locals->ROBSupport[i][0] = false;

		}

	}

	/*Writeback Mode Support Check*/
@@ -3946,7 +3946,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
				}

				if (locals->MinDPPCLKUsingSingleDPP[k] * (1.0 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading / 100.0) <= mode_lib->vba.MaxDppclkRoundedDownToDFSGranularity

						&& locals->SwathWidthYSingleDPP[k] <= locals->MaximumSwathWidth[k]

						&& locals->ODMCombineEnablePerState[i][k] == false) {

						&& locals->ODMCombineEnablePerState[i][k] == dm_odm_combine_mode_disabled) {

					locals->NoOfDPP[i][j][k] = 1;

					locals->RequiredDPPCLK[i][j][k] =

						locals->MinDPPCLKUsingSingleDPP[k] * (1.0 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading / 100.0);
@@ -4035,16 +4035,16 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
	/*Viewport Size Check*/



	for (i = 0; i <= mode_lib->vba.soc.num_states; i++) {

		locals->ViewportSizeSupport[i] = true;

		locals->ViewportSizeSupport[i][0] = true;

		for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {

			if (locals->ODMCombineEnablePerState[i][k] == true) {

			if (locals->ODMCombineEnablePerState[i][k] == dm_odm_combine_mode_2to1) {

				if (dml_min(locals->SwathWidthYSingleDPP[k], dml_round(mode_lib->vba.HActive[k] / 2.0 * mode_lib->vba.HRatio[k]))

						> locals->MaximumSwathWidth[k]) {

					locals->ViewportSizeSupport[i] = false;

					locals->ViewportSizeSupport[i][0] = false;

				}

			} else {

				if (locals->SwathWidthYSingleDPP[k] / 2.0 > locals->MaximumSwathWidth[k]) {

					locals->ViewportSizeSupport[i] = false;

					locals->ViewportSizeSupport[i][0] = false;

				}

			}

		}
@@ -4226,8 +4226,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
						mode_lib->vba.DSCFormatFactor = 1;

					}

					if (locals->RequiresDSC[i][k] == true) {

						if (locals->ODMCombineEnablePerState[i][k]

								== true) {

						if (locals->ODMCombineEnablePerState[i][k] == dm_odm_combine_mode_2to1) {

							if (mode_lib->vba.PixelClockBackEnd[k] / 6.0 / mode_lib->vba.DSCFormatFactor

									> (1.0 - mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading / 100.0) * mode_lib->vba.MaxDSCCLK[i]) {

								locals->DSCCLKRequiredMoreThanSupported[i] =
@@ -4250,7 +4249,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
		mode_lib->vba.TotalDSCUnitsRequired = 0.0;

		for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {

			if (locals->RequiresDSC[i][k] == true) {

				if (locals->ODMCombineEnablePerState[i][k] == true) {

				if (locals->ODMCombineEnablePerState[i][k] == dm_odm_combine_mode_2to1) {

					mode_lib->vba.TotalDSCUnitsRequired =

							mode_lib->vba.TotalDSCUnitsRequired + 2.0;

				} else {
@@ -4292,7 +4291,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
				mode_lib->vba.bpp = locals->OutputBppPerState[i][k];

			}

			if (locals->RequiresDSC[i][k] == true && mode_lib->vba.bpp != 0.0) {

				if (locals->ODMCombineEnablePerState[i][k] == false) {

				if (locals->ODMCombineEnablePerState[i][k] == dm_odm_combine_mode_disabled) {

					locals->DSCDelayPerState[i][k] =

							dscceComputeDelay(

									mode_lib->vba.DSCInputBitPerComponent[k],
@@ -4335,7 +4334,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
	for (i = 0; i <= mode_lib->vba.soc.num_states; i++) {

		for (j = 0; j < 2; j++) {

			for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {

				if (locals->ODMCombineEnablePerState[i][k] == true)

				if (locals->ODMCombineEnablePerState[i][k] == dm_odm_combine_mode_2to1)

					locals->SwathWidthYPerState[i][j][k] = dml_min(locals->SwathWidthYSingleDPP[k], dml_round(locals->HActive[k] / 2 * locals->HRatio[k]));

				else

					locals->SwathWidthYPerState[i][j][k] = locals->SwathWidthYSingleDPP[k] / locals->NoOfDPP[i][j][k];
@@ -4388,28 +4387,28 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 


				locals->EffectiveDETLBLinesLuma = dml_floor(locals->LinesInDETLuma +  dml_min(

						locals->LinesInDETLuma * locals->RequiredDISPCLK[i][j] * locals->BytePerPixelInDETY[k] *

						locals->PSCL_FACTOR[k] / locals->ReturnBWPerState[i],

						locals->PSCL_FACTOR[k] / locals->ReturnBWPerState[i][0],

						locals->EffectiveLBLatencyHidingSourceLinesLuma),

						locals->SwathHeightYPerState[i][j][k]);



				locals->EffectiveDETLBLinesChroma = dml_floor(locals->LinesInDETChroma + dml_min(

						locals->LinesInDETChroma * locals->RequiredDISPCLK[i][j] * locals->BytePerPixelInDETC[k] *

						locals->PSCL_FACTOR_CHROMA[k] / locals->ReturnBWPerState[i],

						locals->PSCL_FACTOR_CHROMA[k] / locals->ReturnBWPerState[i][0],

						locals->EffectiveLBLatencyHidingSourceLinesChroma),

						locals->SwathHeightCPerState[i][j][k]);



				if (locals->BytePerPixelInDETC[k] == 0) {

					locals->UrgentLatencySupportUsPerState[i][j][k] = locals->EffectiveDETLBLinesLuma * (locals->HTotal[k] / locals->PixelClock[k])

							/ locals->VRatio[k] - locals->EffectiveDETLBLinesLuma * locals->SwathWidthYPerState[i][j][k] *

								dml_ceil(locals->BytePerPixelInDETY[k], 1) / (locals->ReturnBWPerState[i] / locals->NoOfDPP[i][j][k]);

								dml_ceil(locals->BytePerPixelInDETY[k], 1) / (locals->ReturnBWPerState[i][0] / locals->NoOfDPP[i][j][k]);

				} else {

					locals->UrgentLatencySupportUsPerState[i][j][k] = dml_min(

						locals->EffectiveDETLBLinesLuma * (locals->HTotal[k] / locals->PixelClock[k])

						/ locals->VRatio[k] - locals->EffectiveDETLBLinesLuma * locals->SwathWidthYPerState[i][j][k] *

						dml_ceil(locals->BytePerPixelInDETY[k], 1) / (locals->ReturnBWPerState[i] / locals->NoOfDPP[i][j][k]),

						dml_ceil(locals->BytePerPixelInDETY[k], 1) / (locals->ReturnBWPerState[i][0] / locals->NoOfDPP[i][j][k]),

							locals->EffectiveDETLBLinesChroma * (locals->HTotal[k] / locals->PixelClock[k]) / (locals->VRatio[k] / 2) -

							locals->EffectiveDETLBLinesChroma * locals->SwathWidthYPerState[i][j][k] / 2 *

							dml_ceil(locals->BytePerPixelInDETC[k], 2) / (locals->ReturnBWPerState[i] / locals->NoOfDPP[i][j][k]));

							dml_ceil(locals->BytePerPixelInDETC[k], 2) / (locals->ReturnBWPerState[i][0] / locals->NoOfDPP[i][j][k]));

				}

			}

		}
@@ -4454,14 +4453,14 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
				locals->SwathHeightYThisState[k] = locals->SwathHeightYPerState[i][j][k];

				locals->SwathHeightCThisState[k] = locals->SwathHeightCPerState[i][j][k];

				locals->SwathWidthYThisState[k] = locals->SwathWidthYPerState[i][j][k];

				mode_lib->vba.ProjectedDCFCLKDeepSleep = dml_max(

						mode_lib->vba.ProjectedDCFCLKDeepSleep,

				mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0] = dml_max(

						mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0],

						mode_lib->vba.PixelClock[k] / 16.0);

				if (mode_lib->vba.BytePerPixelInDETC[k] == 0.0) {

					if (mode_lib->vba.VRatio[k] <= 1.0) {

						mode_lib->vba.ProjectedDCFCLKDeepSleep =

						mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0] =

								dml_max(

										mode_lib->vba.ProjectedDCFCLKDeepSleep,

										mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0],

										1.1

												* dml_ceil(

														mode_lib->vba.BytePerPixelInDETY[k],
@@ -4471,9 +4470,9 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
												* mode_lib->vba.PixelClock[k]

												/ mode_lib->vba.NoOfDPP[i][j][k]);

					} else {

						mode_lib->vba.ProjectedDCFCLKDeepSleep =

						mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0] =

								dml_max(

										mode_lib->vba.ProjectedDCFCLKDeepSleep,

										mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0],

										1.1

												* dml_ceil(

														mode_lib->vba.BytePerPixelInDETY[k],
@@ -4484,9 +4483,9 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
					}

				} else {

					if (mode_lib->vba.VRatio[k] <= 1.0) {

						mode_lib->vba.ProjectedDCFCLKDeepSleep =

						mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0] =

								dml_max(

										mode_lib->vba.ProjectedDCFCLKDeepSleep,

										mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0],

										1.1

												* dml_ceil(

														mode_lib->vba.BytePerPixelInDETY[k],
@@ -4496,9 +4495,9 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
												* mode_lib->vba.PixelClock[k]

												/ mode_lib->vba.NoOfDPP[i][j][k]);

					} else {

						mode_lib->vba.ProjectedDCFCLKDeepSleep =

						mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0] =

								dml_max(

										mode_lib->vba.ProjectedDCFCLKDeepSleep,

										mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0],

										1.1

												* dml_ceil(

														mode_lib->vba.BytePerPixelInDETY[k],
@@ -4508,9 +4507,9 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
												* mode_lib->vba.RequiredDPPCLK[i][j][k]);

					}

					if (mode_lib->vba.VRatio[k] / 2.0 <= 1.0) {

						mode_lib->vba.ProjectedDCFCLKDeepSleep =

						mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0] =

								dml_max(

										mode_lib->vba.ProjectedDCFCLKDeepSleep,

										mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0],

										1.1

												* dml_ceil(

														mode_lib->vba.BytePerPixelInDETC[k],
@@ -4521,9 +4520,9 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
												* mode_lib->vba.PixelClock[k]

												/ mode_lib->vba.NoOfDPP[i][j][k]);

					} else {

						mode_lib->vba.ProjectedDCFCLKDeepSleep =

						mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0] =

								dml_max(

										mode_lib->vba.ProjectedDCFCLKDeepSleep,

										mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0],

										1.1

												* dml_ceil(

														mode_lib->vba.BytePerPixelInDETC[k],
@@ -4559,7 +4558,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
						&mode_lib->vba.PTEBufferSizeNotExceededY[i][j][k],

						&mode_lib->vba.dpte_row_height[k],

						&mode_lib->vba.meta_row_height[k]);

				mode_lib->vba.PrefetchLinesY[k] = CalculatePrefetchSourceLines(

				mode_lib->vba.PrefetchLinesY[0][0][k] = CalculatePrefetchSourceLines(

						mode_lib,

						mode_lib->vba.VRatio[k],

						mode_lib->vba.vtaps[k],
@@ -4598,7 +4597,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
							&mode_lib->vba.PTEBufferSizeNotExceededC[i][j][k],

							&mode_lib->vba.dpte_row_height_chroma[k],

							&mode_lib->vba.meta_row_height_chroma[k]);

					mode_lib->vba.PrefetchLinesC[k] = CalculatePrefetchSourceLines(

					mode_lib->vba.PrefetchLinesC[0][0][k] = CalculatePrefetchSourceLines(

							mode_lib,

							mode_lib->vba.VRatio[k] / 2.0,

							mode_lib->vba.VTAPsChroma[k],
@@ -4612,14 +4611,14 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
					mode_lib->vba.PDEAndMetaPTEBytesPerFrameC = 0.0;

					mode_lib->vba.MetaRowBytesC = 0.0;

					mode_lib->vba.DPTEBytesPerRowC = 0.0;

					locals->PrefetchLinesC[k] = 0.0;

					locals->PrefetchLinesC[0][0][k] = 0.0;

					locals->PTEBufferSizeNotExceededC[i][j][k] = true;

					locals->PTEBufferSizeInRequestsForLuma = mode_lib->vba.PTEBufferSizeInRequestsLuma + mode_lib->vba.PTEBufferSizeInRequestsChroma;

				}

				locals->PDEAndMetaPTEBytesPerFrame[k] =

				locals->PDEAndMetaPTEBytesPerFrame[0][0][k] =

						mode_lib->vba.PDEAndMetaPTEBytesPerFrameY + mode_lib->vba.PDEAndMetaPTEBytesPerFrameC;

				locals->MetaRowBytes[k] = mode_lib->vba.MetaRowBytesY + mode_lib->vba.MetaRowBytesC;

				locals->DPTEBytesPerRow[k] = mode_lib->vba.DPTEBytesPerRowY + mode_lib->vba.DPTEBytesPerRowC;

				locals->MetaRowBytes[0][0][k] = mode_lib->vba.MetaRowBytesY + mode_lib->vba.MetaRowBytesC;

				locals->DPTEBytesPerRow[0][0][k] = mode_lib->vba.DPTEBytesPerRowY + mode_lib->vba.DPTEBytesPerRowC;



				CalculateActiveRowBandwidth(

						mode_lib->vba.GPUVMEnable,
@@ -4646,14 +4645,14 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
									+ mode_lib->vba.TotalNumberOfDCCActiveDPP[i][j]

											* mode_lib->vba.MetaChunkSize)

									* 1024.0

									/ mode_lib->vba.ReturnBWPerState[i];

									/ mode_lib->vba.ReturnBWPerState[i][0];

			if (mode_lib->vba.GPUVMEnable == true) {

				mode_lib->vba.ExtraLatency = mode_lib->vba.ExtraLatency

						+ mode_lib->vba.TotalNumberOfActiveDPP[i][j]

								* mode_lib->vba.PTEGroupSize

								/ mode_lib->vba.ReturnBWPerState[i];

								/ mode_lib->vba.ReturnBWPerState[i][0];

			}

			mode_lib->vba.TimeCalc = 24.0 / mode_lib->vba.ProjectedDCFCLKDeepSleep;

			mode_lib->vba.TimeCalc = 24.0 / mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0];



			for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {

				if (mode_lib->vba.BlendingAndTiming[k] == k) {
@@ -4703,7 +4702,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
			}



			for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {

				locals->MaximumVStartup[k] = mode_lib->vba.VTotal[k] - mode_lib->vba.VActive[k]

				locals->MaximumVStartup[0][0][k] = mode_lib->vba.VTotal[k] - mode_lib->vba.VActive[k]

					- dml_max(1.0, dml_ceil(locals->WritebackDelay[i][k] / (mode_lib->vba.HTotal[k] / mode_lib->vba.PixelClock[k]), 1.0));

			}
@@ -4743,7 +4742,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
						mode_lib->vba.XFCRemoteSurfaceFlipDelay = 0.0;

					}



					CalculateDelayAfterScaler(mode_lib, mode_lib->vba.ReturnBWPerState[i], mode_lib->vba.ReadBandwidthLuma[k], mode_lib->vba.ReadBandwidthChroma[k], mode_lib->vba.MaxTotalVActiveRDBandwidth,

					CalculateDelayAfterScaler(mode_lib, mode_lib->vba.ReturnBWPerState[i][0], mode_lib->vba.ReadBandwidthLuma[k], mode_lib->vba.ReadBandwidthChroma[k], mode_lib->vba.MaxTotalVActiveRDBandwidth,

						mode_lib->vba.DisplayPipeLineDeliveryTimeLuma[k], mode_lib->vba.DisplayPipeLineDeliveryTimeChroma[k],

						mode_lib->vba.RequiredDPPCLK[i][j][k], mode_lib->vba.RequiredDISPCLK[i][j], mode_lib->vba.PixelClock[k], mode_lib->vba.DSCDelayPerState[i][k], mode_lib->vba.NoOfDPP[i][j][k], mode_lib->vba.ScalerEnabled[k], mode_lib->vba.NumberOfCursors[k],

						mode_lib->vba.DPPCLKDelaySubtotal, mode_lib->vba.DPPCLKDelaySCL, mode_lib->vba.DPPCLKDelaySCLLBOnly, mode_lib->vba.DPPCLKDelayCNVCFormater, mode_lib->vba.DPPCLKDelayCNVCCursor, mode_lib->vba.DISPCLKDelaySubtotal,
@@ -4757,14 +4756,14 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
									mode_lib->vba.RequiredDPPCLK[i][j][k],

									mode_lib->vba.RequiredDISPCLK[i][j],

									mode_lib->vba.PixelClock[k],

									mode_lib->vba.ProjectedDCFCLKDeepSleep,

									mode_lib->vba.ProjectedDCFCLKDeepSleep[0][0],

									mode_lib->vba.NoOfDPP[i][j][k],

									mode_lib->vba.NumberOfCursors[k],

									mode_lib->vba.VTotal[k]

											- mode_lib->vba.VActive[k],

									mode_lib->vba.HTotal[k],

									mode_lib->vba.MaxInterDCNTileRepeaters,

									mode_lib->vba.MaximumVStartup[k],

									mode_lib->vba.MaximumVStartup[0][0][k],

									mode_lib->vba.GPUVMMaxPageTableLevels,

									mode_lib->vba.GPUVMEnable,

									mode_lib->vba.DynamicMetadataEnable[k],
@@ -4774,15 +4773,15 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
									mode_lib->vba.UrgentLatencyPixelDataOnly,

									mode_lib->vba.ExtraLatency,

									mode_lib->vba.TimeCalc,

									mode_lib->vba.PDEAndMetaPTEBytesPerFrame[k],

									mode_lib->vba.MetaRowBytes[k],

									mode_lib->vba.DPTEBytesPerRow[k],

									mode_lib->vba.PrefetchLinesY[k],

									mode_lib->vba.PDEAndMetaPTEBytesPerFrame[0][0][k],

									mode_lib->vba.MetaRowBytes[0][0][k],

									mode_lib->vba.DPTEBytesPerRow[0][0][k],

									mode_lib->vba.PrefetchLinesY[0][0][k],

									mode_lib->vba.SwathWidthYPerState[i][j][k],

									mode_lib->vba.BytePerPixelInDETY[k],

									mode_lib->vba.PrefillY[k],

									mode_lib->vba.MaxNumSwY[k],

									mode_lib->vba.PrefetchLinesC[k],

									mode_lib->vba.PrefetchLinesC[0][0][k],

									mode_lib->vba.BytePerPixelInDETC[k],

									mode_lib->vba.PrefillC[k],

									mode_lib->vba.MaxNumSwC[k],
@@ -4812,19 +4811,19 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
				locals->prefetch_vm_bw_valid = true;

				locals->prefetch_row_bw_valid = true;

				for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {

					if (locals->PDEAndMetaPTEBytesPerFrame[k] == 0)

					if (locals->PDEAndMetaPTEBytesPerFrame[0][0][k] == 0)

						locals->prefetch_vm_bw[k] = 0;

					else if (locals->LinesForMetaPTE[k] > 0)

						locals->prefetch_vm_bw[k] = locals->PDEAndMetaPTEBytesPerFrame[k]

						locals->prefetch_vm_bw[k] = locals->PDEAndMetaPTEBytesPerFrame[0][0][k]

							/ (locals->LinesForMetaPTE[k] * locals->HTotal[k] / locals->PixelClock[k]);

					else {

						locals->prefetch_vm_bw[k] = 0;

						locals->prefetch_vm_bw_valid = false;

					}

					if (locals->MetaRowBytes[k] + locals->DPTEBytesPerRow[k] == 0)

					if (locals->MetaRowBytes[0][0][k] + locals->DPTEBytesPerRow[0][0][k] == 0)

						locals->prefetch_row_bw[k] = 0;

					else if (locals->LinesForMetaAndDPTERow[k] > 0)

						locals->prefetch_row_bw[k] = (locals->MetaRowBytes[k] + locals->DPTEBytesPerRow[k])

						locals->prefetch_row_bw[k] = (locals->MetaRowBytes[0][0][k] + locals->DPTEBytesPerRow[0][0][k])

							/ (locals->LinesForMetaAndDPTERow[k] * locals->HTotal[k] / locals->PixelClock[k]);

					else {

						locals->prefetch_row_bw[k] = 0;
@@ -4843,13 +4842,13 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
											mode_lib->vba.RequiredPrefetchPixelDataBWLuma[i][j][k])

											+ mode_lib->vba.meta_row_bw[k] + mode_lib->vba.dpte_row_bw[k]);

				}

				locals->BandwidthWithoutPrefetchSupported[i] = true;

				if (mode_lib->vba.MaximumReadBandwidthWithoutPrefetch > locals->ReturnBWPerState[i]) {

					locals->BandwidthWithoutPrefetchSupported[i] = false;

				locals->BandwidthWithoutPrefetchSupported[i][0] = true;

				if (mode_lib->vba.MaximumReadBandwidthWithoutPrefetch > locals->ReturnBWPerState[i][0]) {

					locals->BandwidthWithoutPrefetchSupported[i][0] = false;

				}



				locals->PrefetchSupported[i][j] = true;

				if (mode_lib->vba.MaximumReadBandwidthWithPrefetch > locals->ReturnBWPerState[i]) {

				if (mode_lib->vba.MaximumReadBandwidthWithPrefetch > locals->ReturnBWPerState[i][0]) {

					locals->PrefetchSupported[i][j] = false;

				}

				for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {
@@ -4874,7 +4873,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
			if (mode_lib->vba.PrefetchSupported[i][j] == true

					&& mode_lib->vba.VRatioInPrefetchSupported[i][j] == true) {

				mode_lib->vba.BandwidthAvailableForImmediateFlip =

						mode_lib->vba.ReturnBWPerState[i];

						mode_lib->vba.ReturnBWPerState[i][0];

				for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {

					mode_lib->vba.BandwidthAvailableForImmediateFlip =

							mode_lib->vba.BandwidthAvailableForImmediateFlip
@@ -4888,9 +4887,9 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
					if ((mode_lib->vba.SourcePixelFormat[k] != dm_420_8

							&& mode_lib->vba.SourcePixelFormat[k] != dm_420_10)) {

						mode_lib->vba.ImmediateFlipBytes[k] =

								mode_lib->vba.PDEAndMetaPTEBytesPerFrame[k]

										+ mode_lib->vba.MetaRowBytes[k]

										+ mode_lib->vba.DPTEBytesPerRow[k];

								mode_lib->vba.PDEAndMetaPTEBytesPerFrame[0][0][k]

										+ mode_lib->vba.MetaRowBytes[0][0][k]

										+ mode_lib->vba.DPTEBytesPerRow[0][0][k];

					}

				}

				mode_lib->vba.TotImmediateFlipBytes = 0.0;
@@ -4918,9 +4917,9 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
									/ mode_lib->vba.PixelClock[k],

							mode_lib->vba.VRatio[k],

							mode_lib->vba.Tno_bw[k],

							mode_lib->vba.PDEAndMetaPTEBytesPerFrame[k],

							mode_lib->vba.MetaRowBytes[k],

							mode_lib->vba.DPTEBytesPerRow[k],

							mode_lib->vba.PDEAndMetaPTEBytesPerFrame[0][0][k],

							mode_lib->vba.MetaRowBytes[0][0][k],

							mode_lib->vba.DPTEBytesPerRow[0][0][k],

							mode_lib->vba.DCCEnable[k],

							mode_lib->vba.dpte_row_height[k],

							mode_lib->vba.meta_row_height[k],
@@ -4945,7 +4944,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
				}

				mode_lib->vba.ImmediateFlipSupportedForState[i][j] = true;

				if (mode_lib->vba.total_dcn_read_bw_with_flip

						> mode_lib->vba.ReturnBWPerState[i]) {

						> mode_lib->vba.ReturnBWPerState[i][0]) {

					mode_lib->vba.ImmediateFlipSupportedForState[i][j] = false;

				}

				for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {
@@ -4961,13 +4960,13 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 


	/*Vertical Active BW support*/

	for (i = 0; i <= mode_lib->vba.soc.num_states; i++) {

		mode_lib->vba.MaxTotalVerticalActiveAvailableBandwidth[i] = dml_min(mode_lib->vba.ReturnBusWidth *

		mode_lib->vba.MaxTotalVerticalActiveAvailableBandwidth[i][0] = dml_min(mode_lib->vba.ReturnBusWidth *

				mode_lib->vba.DCFCLKPerState[i], mode_lib->vba.FabricAndDRAMBandwidthPerState[i] * 1000) *

				mode_lib->vba.MaxAveragePercentOfIdealDRAMBWDisplayCanUseInNormalSystemOperation / 100;

		if (mode_lib->vba.MaxTotalVActiveRDBandwidth <= mode_lib->vba.MaxTotalVerticalActiveAvailableBandwidth[i])

			mode_lib->vba.TotalVerticalActiveBandwidthSupport[i] = true;

		if (mode_lib->vba.MaxTotalVActiveRDBandwidth <= mode_lib->vba.MaxTotalVerticalActiveAvailableBandwidth[i][0])

			mode_lib->vba.TotalVerticalActiveBandwidthSupport[i][0] = true;

		else

			mode_lib->vba.TotalVerticalActiveBandwidthSupport[i] = false;

			mode_lib->vba.TotalVerticalActiveBandwidthSupport[i][0] = false;

	}



	/*PTE Buffer Size Check*/
@@ -5055,7 +5054,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
				status = DML_FAIL_SCALE_RATIO_TAP;

			} else if (mode_lib->vba.SourceFormatPixelAndScanSupport != true) {

				status = DML_FAIL_SOURCE_PIXEL_FORMAT;

			} else if (locals->ViewportSizeSupport[i] != true) {

			} else if (locals->ViewportSizeSupport[i][0] != true) {

				status = DML_FAIL_VIEWPORT_SIZE;

			} else if (locals->DIOSupport[i] != true) {

				status = DML_FAIL_DIO_SUPPORT;
@@ -5065,7 +5064,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
				status = DML_FAIL_DSC_CLK_REQUIRED;

			} else if (locals->UrgentLatencySupport[i][j] != true) {

				status = DML_FAIL_URGENT_LATENCY;

			} else if (locals->ROBSupport[i] != true) {

			} else if (locals->ROBSupport[i][0] != true) {

				status = DML_FAIL_REORDERING_BUFFER;

			} else if (locals->DISPCLK_DPPCLK_Support[i][j] != true) {

				status = DML_FAIL_DISPCLK_DPPCLK;
@@ -5085,7 +5084,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
				status = DML_FAIL_PITCH_SUPPORT;

			} else if (locals->PrefetchSupported[i][j] != true) {

				status = DML_FAIL_PREFETCH_SUPPORT;

			} else if (locals->TotalVerticalActiveBandwidthSupport[i] != true) {

			} else if (locals->TotalVerticalActiveBandwidthSupport[i][0] != true) {

				status = DML_FAIL_TOTAL_V_ACTIVE_BW;

			} else if (locals->VRatioInPrefetchSupported[i][j] != true) {

				status = DML_FAIL_V_RATIO_PREFETCH;
@@ -5131,7 +5130,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode 
	mode_lib->vba.DRAMSpeed = mode_lib->vba.DRAMSpeedPerState[mode_lib->vba.VoltageLevel];

	mode_lib->vba.FabricClock = mode_lib->vba.FabricClockPerState[mode_lib->vba.VoltageLevel];

	mode_lib->vba.SOCCLK = mode_lib->vba.SOCCLKPerState[mode_lib->vba.VoltageLevel];

	mode_lib->vba.ReturnBW = locals->ReturnBWPerState[mode_lib->vba.VoltageLevel];

	mode_lib->vba.ReturnBW = locals->ReturnBWPerState[mode_lib->vba.VoltageLevel][0];

	mode_lib->vba.FabricAndDRAMBandwidth = locals->FabricAndDRAMBandwidthPerState[mode_lib->vba.VoltageLevel];

	for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {

		if (mode_lib->vba.BlendingAndTiming[k] == k) {

drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c

+78 −79

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/display/dc/dml/display_mode_enums.h

+16 −0
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ enum mpc_combine_affinity { 
	dm_mpc_never

};



enum RequestType {

	REQ_256Bytes, REQ_128BytesNonContiguous, REQ_128BytesContiguous, REQ_NA

};



enum self_refresh_affinity {

	dm_try_to_allow_self_refresh_and_mclk_switch,

	dm_allow_self_refresh_and_mclk_switch,
@@ -165,4 +169,16 @@ enum odm_combine_mode { 
	dm_odm_combine_mode_4to1,

};



enum odm_combine_policy {

	dm_odm_combine_policy_dal,

	dm_odm_combine_policy_none,

	dm_odm_combine_policy_2to1,

	dm_odm_combine_policy_4to1,

};



enum immediate_flip_requirement {

	dm_immediate_flip_not_required,

	dm_immediate_flip_required,

};



#endif