Skip to content

Commit 0c9ae5c

Browse files
Alex Hungalexdeucher
authored andcommitted
Revert "drm/amd/display: Create one virtual connector in DC"
This reverts commit 5543401. [WHY & HOW] The writeback series cause a regression in thunderbolt display. Signed-off-by: Alex Hung <alex.hung@amd.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 7d3dc50 commit 0c9ae5c

2 files changed

Lines changed: 3 additions & 11 deletions

File tree

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,10 +1674,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
16741674
init_data.nbio_reg_offsets = adev->reg_offset[NBIO_HWIP][0];
16751675
init_data.clk_reg_offsets = adev->reg_offset[CLK_HWIP][0];
16761676

1677-
/* Enable DWB for tested platforms only */
1678-
if (adev->ip_versions[DCE_HWIP][0] >= IP_VERSION(3, 0, 0))
1679-
init_data.num_virtual_links = 1;
1680-
16811677
INIT_LIST_HEAD(&adev->dm.da_list);
16821678

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

4472-
link = dc_get_link_at_index(dm->dc, i);
4473-
4474-
if (link->connector_signal == SIGNAL_TYPE_VIRTUAL)
4475-
continue;
4476-
44774468
aconnector = kzalloc(sizeof(*aconnector), GFP_KERNEL);
44784469
if (!aconnector)
44794470
goto fail;
@@ -4492,6 +4483,8 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
44924483
goto fail;
44934484
}
44944485

4486+
link = dc_get_link_at_index(dm->dc, i);
4487+
44954488
if (!dc_link_detect_connection_type(link, &new_connection_type))
44964489
DRM_ERROR("KMS: Failed to detect connector\n");
44974490

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ static void enable_memory_low_power(struct dc *dc)
9696
if (dc->debug.enable_mem_low_power.bits.vpg && dc->res_pool->stream_enc[0]->vpg->funcs->vpg_powerdown) {
9797
// Power down VPGs
9898
for (i = 0; i < dc->res_pool->stream_enc_count; i++)
99-
if (dc->res_pool->stream_enc[i]->vpg)
100-
dc->res_pool->stream_enc[i]->vpg->funcs->vpg_powerdown(dc->res_pool->stream_enc[i]->vpg);
99+
dc->res_pool->stream_enc[i]->vpg->funcs->vpg_powerdown(dc->res_pool->stream_enc[i]->vpg);
101100
#if defined(CONFIG_DRM_AMD_DC_FP)
102101
for (i = 0; i < dc->res_pool->hpo_dp_stream_enc_count; i++)
103102
dc->res_pool->hpo_dp_stream_enc[i]->vpg->funcs->vpg_powerdown(dc->res_pool->hpo_dp_stream_enc[i]->vpg);

0 commit comments

Comments
 (0)