diff options
| author | Alex Hung <alex.hung@amd.com> | 2023-10-11 13:23:07 -0600 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2023-10-13 11:30:58 -0400 |
| commit | 0c9ae5cfefb06ed0f9d8d8ef140f8baa946c3ac4 (patch) | |
| tree | bce20784913b0d5945a62ebd8afa388b0c89d6f2 /drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | |
| parent | 7d3dc50e241d8d198e7f1ed9ae8195121fe8fc82 (diff) | |
| download | linux-stable-0c9ae5cfefb06ed0f9d8d8ef140f8baa946c3ac4.tar.gz linux-stable-0c9ae5cfefb06ed0f9d8d8ef140f8baa946c3ac4.tar.bz2 linux-stable-0c9ae5cfefb06ed0f9d8d8ef140f8baa946c3ac4.zip | |
Revert "drm/amd/display: Create one virtual connector in DC"
This reverts commit 554340133e4f596fc40fd75a58f9cf18b6b8dbbc.
[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>
Diffstat (limited to 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 1a6c682eb311..801f87a12ccf 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -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"); |