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_wb.c | |
| parent | 6ec0e23f1823fd6c359e1d7ed949907b64d42633 (diff) | |
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_wb.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c index b3e634b0f712..74e656696d8e 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c @@ -30,7 +30,6 @@ #include "amdgpu_dm.h" #include "amdgpu_dm_wb.h" #include "amdgpu_display.h" -#include "dc.h" #include <drm/drm_atomic_state_helper.h> #include <drm/drm_modeset_helper_vtables.h> @@ -184,18 +183,13 @@ static const struct drm_connector_helper_funcs amdgpu_dm_wb_conn_helper_funcs = }; int amdgpu_dm_wb_connector_init(struct amdgpu_display_manager *dm, - struct amdgpu_dm_wb_connector *wbcon, - uint32_t link_index) + struct drm_writeback_connector *wbcon) { - struct dc *dc = dm->dc; - struct dc_link *link = dc_get_link_at_index(dc, link_index); int res = 0; - wbcon->link = link; + drm_connector_helper_add(&wbcon->base, &amdgpu_dm_wb_conn_helper_funcs); - drm_connector_helper_add(&wbcon->base.base, &amdgpu_dm_wb_conn_helper_funcs); - - res = drm_writeback_connector_init(&dm->adev->ddev, &wbcon->base, + res = drm_writeback_connector_init(&dm->adev->ddev, wbcon, &amdgpu_dm_wb_connector_funcs, &amdgpu_dm_wb_encoder_helper_funcs, amdgpu_dm_wb_formats, @@ -208,8 +202,8 @@ int amdgpu_dm_wb_connector_init(struct amdgpu_display_manager *dm, * Some of the properties below require access to state, like bpc. * Allocate some default initial connector state with our reset helper. */ - if (wbcon->base.base.funcs->reset) - wbcon->base.base.funcs->reset(&wbcon->base.base); + if (wbcon->base.funcs->reset) + wbcon->base.funcs->reset(&wbcon->base); return 0; } |