Commit 91a51fbf authored Jan 29, 2021 by Wesley Chalmers Committed by Alex Deucher Feb 09, 2021

drm/amd/display: DIO Supported for virtual displays



[WHY]
Virtual displays do not use the backend of the pipe, and so have
infinite backend bandwidth.

[HOW]
Add a skip_dio_check bool to the VBA struct, which is used to override
the DIOSupport calculations.

Signed-off-by: Wesley Chalmers <Wesley.Chalmers@amd.com>
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Anson Jacob <Anson.Jacob@amd.com>
Acked-by: Chris Park <Chris.Park@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 148816f9

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2097,6 +2097,7 @@ int dcn20_populate_dml_pipes_from_context(
		pipes[pipe_cnt].pipe.dest.pixel_rate_mhz *= 2;
		pipes[pipe_cnt].pipe.dest.otg_inst = res_ctx->pipe_ctx[i].stream_res.tg->inst;
		pipes[pipe_cnt].dout.dp_lanes = 4;
		pipes[pipe_cnt].dout.is_virtual = 0;
		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;
		switch (get_num_odm_splits(&res_ctx->pipe_ctx[i])) {
		@@ -2150,6 +2151,7 @@ int dcn20_populate_dml_pipes_from_context(
		break;
		default:
		/* In case there is no signal, set dp with 4 lanes to allow max config */
		pipes[pipe_cnt].dout.is_virtual = 1;
		pipes[pipe_cnt].dout.output_type = dm_dp;
		pipes[pipe_cnt].dout.dp_lanes = 4;
		}

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -4168,10 +4168,11 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
		for (i = 0; i <= mode_lib->vba.soc.num_states; i++) {
		locals->DIOSupport[i] = true;
		for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {
		if (locals->OutputBppPerState[i][k] == BPP_INVALID
		if (!mode_lib->vba.skip_dio_check[k]
		&& (locals->OutputBppPerState[i][k] == BPP_INVALID
		\|\| (mode_lib->vba.OutputFormat[k] == dm_420
		&& mode_lib->vba.Interlace[k] == true
		&& mode_lib->vba.ProgressiveToInterlaceUnitInOPP == true)) {
		&& mode_lib->vba.ProgressiveToInterlaceUnitInOPP == true))) {
		locals->DIOSupport[i] = false;
		}
		}

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -4289,10 +4289,11 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode
		for (i = 0; i <= mode_lib->vba.soc.num_states; i++) {
		locals->DIOSupport[i] = true;
		for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {
		if (locals->OutputBppPerState[i][k] == BPP_INVALID
		if (!mode_lib->vba.skip_dio_check[k]
		&& (locals->OutputBppPerState[i][k] == BPP_INVALID
		\|\| (mode_lib->vba.OutputFormat[k] == dm_420
		&& mode_lib->vba.Interlace[k] == true
		&& mode_lib->vba.ProgressiveToInterlaceUnitInOPP == true)) {
		&& mode_lib->vba.ProgressiveToInterlaceUnitInOPP == true))) {
		locals->DIOSupport[i] = false;
		}
		}

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -4257,10 +4257,11 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
		for (i = 0; i <= mode_lib->vba.soc.num_states; i++) {
		locals->DIOSupport[i] = true;
		for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {
		if (locals->OutputBppPerState[i][k] == BPP_INVALID
		if (!mode_lib->vba.skip_dio_check[k]
		&& (locals->OutputBppPerState[i][k] == BPP_INVALID
		\|\| (mode_lib->vba.OutputFormat[k] == dm_420
		&& mode_lib->vba.Interlace[k] == true
		&& mode_lib->vba.ProgressiveToInterlaceUnitInOPP == true)) {
		&& mode_lib->vba.ProgressiveToInterlaceUnitInOPP == true))) {
		locals->DIOSupport[i] = false;
		}
		}

drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4263,7 +4263,7 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
		for (i = 0; i < v->soc.num_states; i++) {
		v->DIOSupport[i] = true;
		for (k = 0; k <= v->NumberOfActivePlanes - 1; k++) {
		if (v->BlendingAndTiming[k] == k && (v->Output[k] == dm_dp \|\| v->Output[k] == dm_edp \|\| v->Output[k] == dm_hdmi)
		if (!v->skip_dio_check[k] && v->BlendingAndTiming[k] == k && (v->Output[k] == dm_dp \|\| v->Output[k] == dm_edp \|\| v->Output[k] == dm_hdmi)
		&& (v->OutputBppPerState[i][k] == 0
		\|\| (v->OutputFormat[k] == dm_420 && v->Interlace[k] == true && v->ProgressiveToInterlaceUnitInOPP == true))) {
		v->DIOSupport[i] = false;