drm/amd/display: Use connector list for finding DPRX CRC aux

[Why]
This change is a refactor in preparation for adding locking and removing
the requirement for a stream state on the CRTC for enabling CRC capture
to fix igt@kms_plane_multiple@* warnings.

[How]
We can get the aux by finding the matching connector for the CRTC
with the assumption that we're not doing cloning.

Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: David Francis <David.Francis@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
index eb114e377233801bda5cb651e2c1e5a6b3ff774b..513e40667f8f656c58fb551e2e04a079ef78ffe5 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
@@ -102,7 +102,6 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name)
        struct amdgpu_device *adev = crtc->dev->dev_private;
        struct dm_crtc_state *crtc_state = to_dm_crtc_state(crtc->state);
        struct dc_stream_state *stream_state = crtc_state->stream;
-       struct amdgpu_dm_connector *aconn;
        struct drm_dp_aux *aux = NULL;
        bool enable = false;
        bool enabled = false;
@@ -138,9 +137,21 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name)
         * DPRX DITHER  | XXXX        | Enable DPRX CRC, need 'aux', set dither
         */
        if (dm_is_crc_source_dprx(source) ||
-               (source == AMDGPU_DM_PIPE_CRC_SOURCE_NONE &&
-                dm_is_crc_source_dprx(crtc_state->crc_src))) {
-               aconn = stream_state->link->priv;
+           (source == AMDGPU_DM_PIPE_CRC_SOURCE_NONE &&
+            dm_is_crc_source_dprx(crtc_state->crc_src))) {
+               struct amdgpu_dm_connector *aconn = NULL;
+               struct drm_connector *connector;
+               struct drm_connector_list_iter conn_iter;
+
+               drm_connector_list_iter_begin(crtc->dev, &conn_iter);
+               drm_for_each_connector_iter(connector, &conn_iter) {
+                       if (!connector->state || connector->state->crtc != crtc)
+                               continue;
+
+                       aconn = to_amdgpu_dm_connector(connector);
+                       break;
+               }
+               drm_connector_list_iter_end(&conn_iter);
 
                if (!aconn) {
                        DRM_DEBUG_DRIVER("No amd connector matching CRTC-%d\n", crtc->index);