drm/amd/display: Return drm_connector from find_first_crtc_matching_connector

[WHY]
We will be dealing with two types of connector: amdgpu_dm_connector
and drm_writeback_connector.

[HOW]
We want to find both and then cast to the appriopriate type afterwards.

Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 1d9a10384f932816310f1cb7cd97136ec49d5c95..5c89a043ac106acfecaf962492d5f9dbc25d5897 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2664,7 +2664,7 @@ static int dm_suspend(void *handle)
        return 0;
 }
 
-struct amdgpu_dm_connector *
+struct drm_connector *
 amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_state *state,
                                             struct drm_crtc *crtc)
 {
@@ -2677,7 +2677,7 @@ amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_state *state,
                crtc_from_state = new_con_state->crtc;
 
                if (crtc_from_state == crtc)
-                       return to_amdgpu_dm_connector(connector);
+                       return connector;
        }
 
        return NULL;
@@ -9407,6 +9407,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
         * update changed items
         */
        struct amdgpu_crtc *acrtc = NULL;
+       struct drm_connector *connector = NULL;
        struct amdgpu_dm_connector *aconnector = NULL;
        struct drm_connector_state *drm_new_conn_state = NULL, *drm_old_conn_state = NULL;
        struct dm_connector_state *dm_new_conn_state = NULL, *dm_old_conn_state = NULL;
@@ -9416,7 +9417,8 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
        dm_old_crtc_state = to_dm_crtc_state(old_crtc_state);
        dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
        acrtc = to_amdgpu_crtc(crtc);
-       aconnector = amdgpu_dm_find_first_crtc_matching_connector(state, crtc);
+       connector = amdgpu_dm_find_first_crtc_matching_connector(state, crtc);
+       aconnector = to_amdgpu_dm_connector(connector);
 
        /* TODO This hack should go away */
        if (aconnector && enable) {

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
index 3d480be802cb5ec478bf98a477698f7a7c72444e..3710f4d0f2cb224976d18da27627ff40c0e50853 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
@@ -834,7 +834,7 @@ struct dc_stream_state *
 int dm_atomic_get_state(struct drm_atomic_state *state,
                        struct dm_atomic_state **dm_state);
 
-struct amdgpu_dm_connector *
+struct drm_connector *
 amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_state *state,
                                             struct drm_crtc *crtc);
 

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index b599efda3b19f908ebf0c225cf1968520dfaaf23..19ae5587dd5aeca9ac3f7b69d673898ab10e733b 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -1500,14 +1500,16 @@ int pre_validate_dsc(struct drm_atomic_state *state,
                int ind = find_crtc_index_in_state_by_stream(state, stream);
 
                if (ind >= 0) {
+                       struct drm_connector *connector;
                        struct amdgpu_dm_connector *aconnector;
                        struct drm_connector_state *drm_new_conn_state;
                        struct dm_connector_state *dm_new_conn_state;
                        struct dm_crtc_state *dm_old_crtc_state;
 
-                       aconnector =
+                       connector =
                                amdgpu_dm_find_first_crtc_matching_connector(state,
                                                                             state->crtcs[ind].ptr);
+                       aconnector = to_amdgpu_dm_connector(connector);
                        drm_new_conn_state =
                                drm_atomic_get_new_connector_state(state,
                                                                   &aconnector->base);