Commit ee2698cf authored by Angus Wang's avatar Angus Wang Committed by Alex Deucher
Browse files

drm/amd/display: Changed pipe split policy to allow for multi-display pipe split 

[WHY]
Current implementation of pipe split policy prevents pipe split with
multiple displays connected, which caused the MCLK speed to be stuck at
max

[HOW]
Changed the pipe split policies so that pipe split is allowed for
multi-display configurations

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1522
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1709
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1655
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1403



Note this is a backport of this commit from amdgpu drm-next for 5.16.

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAngus Wang <angus.wang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 33bb6391

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

+1 −1
Original line number Diff line number Diff line
@@ -1069,7 +1069,7 @@ static const struct dc_debug_options debug_defaults_drv = { 
		.timing_trace = false,

		.clock_trace = true,

		.disable_pplib_clock_request = true,

		.pipe_split_policy = MPC_SPLIT_AVOID_MULT_DISP,

		.pipe_split_policy = MPC_SPLIT_DYNAMIC,

		.force_single_disp_pipe_split = false,

		.disable_dcc = DCC_ENABLE,

		.vsr_support = true,

drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static const struct dc_debug_options debug_defaults_drv = { 
		.timing_trace = false,

		.clock_trace = true,

		.disable_pplib_clock_request = true,

		.pipe_split_policy = MPC_SPLIT_AVOID,

		.pipe_split_policy = MPC_SPLIT_DYNAMIC,

		.force_single_disp_pipe_split = false,

		.disable_dcc = DCC_ENABLE,

		.vsr_support = true,

drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ static const struct dc_debug_options debug_defaults_drv = { 
		.clock_trace = true,

		.disable_pplib_clock_request = true,

		.min_disp_clk_khz = 100000,

		.pipe_split_policy = MPC_SPLIT_AVOID_MULT_DISP,

		.pipe_split_policy = MPC_SPLIT_DYNAMIC,

		.force_single_disp_pipe_split = false,

		.disable_dcc = DCC_ENABLE,

		.vsr_support = true,

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static const struct dc_debug_options debug_defaults_drv = { 
	.timing_trace = false,

	.clock_trace = true,

	.disable_pplib_clock_request = true,

	.pipe_split_policy = MPC_SPLIT_AVOID_MULT_DISP,

	.pipe_split_policy = MPC_SPLIT_DYNAMIC,

	.force_single_disp_pipe_split = false,

	.disable_dcc = DCC_ENABLE,

	.vsr_support = true,

drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ static const struct dc_debug_options debug_defaults_drv = { 
	.disable_clock_gate = true,

	.disable_pplib_clock_request = true,

	.disable_pplib_wm_range = true,

	.pipe_split_policy = MPC_SPLIT_AVOID_MULT_DISP,

	.pipe_split_policy = MPC_SPLIT_DYNAMIC,

	.force_single_disp_pipe_split = false,

	.disable_dcc = DCC_ENABLE,

	.vsr_support = true,