diff options
| author | Alex Hung <alex.hung@amd.com> | 2023-10-11 13:18:48 -0600 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2023-10-13 11:26:13 -0400 |
| commit | c66705c5a87eebe6fb73bdb3098a0a01661e8a2c (patch) | |
| tree | 2f4183fe54075aba539fe8ce24596434c2b4c853 /drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | |
| parent | 6ec0e23f1823fd6c359e1d7ed949907b64d42633 (diff) | |
| download | linux-stable-c66705c5a87eebe6fb73bdb3098a0a01661e8a2c.tar.gz linux-stable-c66705c5a87eebe6fb73bdb3098a0a01661e8a2c.tar.bz2 linux-stable-c66705c5a87eebe6fb73bdb3098a0a01661e8a2c.zip | |
Revert "drm/amd/display: Create amdgpu_dm_wb_connector"
This reverts commit a5f9523c9ca352d6454e81ff9e9a4419f457210a.
[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 | 5 |
1 files changed, 2 insertions, 3 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 653760cdbe7c..3de997992d05 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4496,14 +4496,14 @@ 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 amdgpu_dm_wb_connector *wbcon = kzalloc(sizeof(*wbcon), GFP_KERNEL); + 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, i)) { + if (amdgpu_dm_wb_connector_init(dm, wbcon)) { DRM_ERROR("KMS: Failed to initialize writeback connector\n"); kfree(wbcon); continue; @@ -7592,7 +7592,6 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm, struct dc_link *link = dc_get_link_at_index(dc, link_index); struct amdgpu_i2c_adapter *i2c; - /* Not needed for writeback connector */ link->priv = aconnector; |