diff options
| author | Alex Hung <alex.hung@amd.com> | 2023-10-11 13:21:50 -0600 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2023-10-13 11:29:37 -0400 |
| commit | 3dcb66171583cdec72b21496947cf18df9ed9740 (patch) | |
| tree | eed2dc6bfb9c7c36e041ca79ffc7b8a5f6c682ab /drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | |
| parent | 7f5504021e9a1e9fb7eb20505eac1167ad3aef50 (diff) | |
| download | linux-stable-3dcb66171583cdec72b21496947cf18df9ed9740.tar.gz linux-stable-3dcb66171583cdec72b21496947cf18df9ed9740.tar.bz2 linux-stable-3dcb66171583cdec72b21496947cf18df9ed9740.zip | |
Revert "drm/amd/display: Initialize writeback connector"
This reverts commit a2830b9e852f4007f7ee53f2c5765ab07ddb55e2.
[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 | 20 |
1 files changed, 1 insertions, 19 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 769f8d619453..4a43f26d51d7 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -54,7 +54,6 @@ #include "amdgpu_dm_crtc.h" #include "amdgpu_dm_hdcp.h" #include <drm/display/drm_hdcp_helper.h> -#include "amdgpu_dm_wb.h" #include "amdgpu_pm.h" #include "amdgpu_atombios.h" @@ -4472,25 +4471,8 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) link = dc_get_link_at_index(dm->dc, i); - if (link->connector_signal == SIGNAL_TYPE_VIRTUAL) { - struct drm_writeback_connector *wbcon = kzalloc(sizeof(*wbcon), GFP_KERNEL); - - if (!wbcon) { - DRM_ERROR("KMS: Failed to allocate writeback connector\n"); - continue; - } - - if (amdgpu_dm_wb_connector_init(dm, wbcon)) { - DRM_ERROR("KMS: Failed to initialize writeback connector\n"); - kfree(wbcon); - continue; - } - - link->psr_settings.psr_feature_enabled = false; - link->psr_settings.psr_version = DC_PSR_VERSION_UNSUPPORTED; - + if (link->connector_signal == SIGNAL_TYPE_VIRTUAL) continue; - } aconnector = kzalloc(sizeof(*aconnector), GFP_KERNEL); if (!aconnector) |