Commit 0c9ae5cf authored by Alex Hung's avatar Alex Hung Committed by Alex Deucher
Browse files

Revert "drm/amd/display: Create one virtual connector in DC" 



This reverts commit 55434013.

[WHY & HOW]
The writeback series cause a regression in thunderbolt display.

Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7d3dc50e

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −9
Original line number Diff line number Diff line
@@ -1674,10 +1674,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) 
	init_data.nbio_reg_offsets = adev->reg_offset[NBIO_HWIP][0];

	init_data.clk_reg_offsets = adev->reg_offset[CLK_HWIP][0];



	/* Enable DWB for tested platforms only */

	if (adev->ip_versions[DCE_HWIP][0] >= IP_VERSION(3, 0, 0))

		init_data.num_virtual_links = 1;



	INIT_LIST_HEAD(&adev->dm.da_list);



	retrieve_dmi_info(&adev->dm);
@@ -4469,11 +4465,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
			continue;

		}



		link = dc_get_link_at_index(dm->dc, i);



		if (link->connector_signal == SIGNAL_TYPE_VIRTUAL)

			continue;



		aconnector = kzalloc(sizeof(*aconnector), GFP_KERNEL);

		if (!aconnector)

			goto fail;
@@ -4492,6 +4483,8 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
			goto fail;

		}



		link = dc_get_link_at_index(dm->dc, i);



		if (!dc_link_detect_connection_type(link, &new_connection_type))

			DRM_ERROR("KMS: Failed to detect connector\n");

drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c

+1 −2
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ static void enable_memory_low_power(struct dc *dc) 
	if (dc->debug.enable_mem_low_power.bits.vpg && dc->res_pool->stream_enc[0]->vpg->funcs->vpg_powerdown) {

		// Power down VPGs

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

			if (dc->res_pool->stream_enc[i]->vpg)

			dc->res_pool->stream_enc[i]->vpg->funcs->vpg_powerdown(dc->res_pool->stream_enc[i]->vpg);

#if defined(CONFIG_DRM_AMD_DC_FP)

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