Skip to content

Commit 3dcb661

Browse files
Alex Hungalexdeucher
authored andcommitted
Revert "drm/amd/display: Initialize writeback connector"
This reverts commit a2830b9. [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 7f55040 commit 3dcb661

4 files changed

Lines changed: 2 additions & 265 deletions

File tree

drivers/gpu/drm/amd/display/amdgpu_dm/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ AMDGPUDM = \
3737
amdgpu_dm_helpers.o \
3838
amdgpu_dm_pp_smu.o \
3939
amdgpu_dm_psr.o \
40-
amdgpu_dm_replay.o \
41-
amdgpu_dm_wb.o
40+
amdgpu_dm_replay.o
4241

4342
ifdef CONFIG_DRM_AMD_DC_FP
4443
AMDGPUDM += dc_fpu.o

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
#include "amdgpu_dm_crtc.h"
5555
#include "amdgpu_dm_hdcp.h"
5656
#include <drm/display/drm_hdcp_helper.h>
57-
#include "amdgpu_dm_wb.h"
5857
#include "amdgpu_pm.h"
5958
#include "amdgpu_atombios.h"
6059

@@ -4472,25 +4471,8 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
44724471

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

4475-
if (link->connector_signal == SIGNAL_TYPE_VIRTUAL) {
4476-
struct drm_writeback_connector *wbcon = kzalloc(sizeof(*wbcon), GFP_KERNEL);
4477-
4478-
if (!wbcon) {
4479-
DRM_ERROR("KMS: Failed to allocate writeback connector\n");
4480-
continue;
4481-
}
4482-
4483-
if (amdgpu_dm_wb_connector_init(dm, wbcon)) {
4484-
DRM_ERROR("KMS: Failed to initialize writeback connector\n");
4485-
kfree(wbcon);
4486-
continue;
4487-
}
4488-
4489-
link->psr_settings.psr_feature_enabled = false;
4490-
link->psr_settings.psr_version = DC_PSR_VERSION_UNSUPPORTED;
4491-
4474+
if (link->connector_signal == SIGNAL_TYPE_VIRTUAL)
44924475
continue;
4493-
}
44944476

44954477
aconnector = kzalloc(sizeof(*aconnector), GFP_KERNEL);
44964478
if (!aconnector)

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

Lines changed: 0 additions & 209 deletions
This file was deleted.

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)