drm/amd/display: Revert "drm/amd/display: Use drm_connector in create_validate_stream...

This reverts commit c4c182b5488e8d4a48be3327aab14d778cdfe5e7.

After this was commit PCON and USB4 issues were observed. A new fix will
be submitted instead.

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>

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 9121482d059e3336d1ba5e8497274edd2eb8e190..6e0772316b8c17bcb6db507ace3a0cd7b0f9ab7c 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6685,21 +6685,18 @@ cleanup:
 }
 
 struct dc_stream_state *
-create_validate_stream_for_sink(struct drm_connector *connector,
+create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,
                                const struct drm_display_mode *drm_mode,
                                const struct dm_connector_state *dm_state,
                                const struct dc_stream_state *old_stream)
 {
-       struct amdgpu_dm_connector *aconnector = NULL;
+       struct drm_connector *connector = &aconnector->base;
        struct amdgpu_device *adev = drm_to_adev(connector->dev);
        struct dc_stream_state *stream;
        const struct drm_connector_state *drm_state = dm_state ? &dm_state->base : NULL;
        int requested_bpc = drm_state ? drm_state->max_requested_bpc : 8;
        enum dc_status dc_result = DC_OK;
 
-       if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-               aconnector = to_amdgpu_dm_connector(connector);
-
        do {
                stream = create_stream_for_sink(connector, drm_mode,
                                                dm_state, old_stream,
@@ -6710,14 +6707,10 @@ create_validate_stream_for_sink(struct drm_connector *connector,
                }
 
                dc_result = dc_validate_stream(adev->dm.dc, stream);
-
-               if (!aconnector) /* writeback connector */
-                       return stream;
-
                if (dc_result == DC_OK && stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST)
                        dc_result = dm_dp_mst_is_port_support_mode(aconnector, stream);
 
-               if (dc_result == DC_OK && connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK)
+               if (dc_result == DC_OK)
                        dc_result = dm_validate_stream_and_context(adev->dm.dc, stream);
 
                if (dc_result != DC_OK) {
@@ -6739,7 +6732,7 @@ create_validate_stream_for_sink(struct drm_connector *connector,
                DRM_DEBUG_KMS("Retry forcing YCbCr420 encoding\n");
 
                aconnector->force_yuv420_output = true;
-               stream = create_validate_stream_for_sink(connector, drm_mode,
+               stream = create_validate_stream_for_sink(aconnector, drm_mode,
                                                dm_state, old_stream);
                aconnector->force_yuv420_output = false;
        }
@@ -6754,9 +6747,6 @@ enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connec
        struct dc_sink *dc_sink;
        /* TODO: Unhardcode stream count */
        struct dc_stream_state *stream;
-       /* we always have an amdgpu_dm_connector here since we got
-        * here via the amdgpu_dm_connector_helper_funcs
-        */
        struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
 
        if ((mode->flags & DRM_MODE_FLAG_INTERLACE) ||
@@ -6781,7 +6771,7 @@ enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connec
 
        drm_mode_set_crtcinfo(mode, 0);
 
-       stream = create_validate_stream_for_sink(connector, mode,
+       stream = create_validate_stream_for_sink(aconnector, mode,
                                                 to_dm_connector_state(connector->state),
                                                 NULL);
        if (stream) {
@@ -9641,7 +9631,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
                if (!drm_atomic_crtc_needs_modeset(new_crtc_state))
                        goto skip_modeset;
 
-               new_stream = create_validate_stream_for_sink(connector,
+               new_stream = create_validate_stream_for_sink(aconnector,
                                                             &new_crtc_state->mode,
                                                             dm_new_conn_state,
                                                             dm_old_crtc_state->stream);

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 b16613082bc30ad7a9c4ae1348e49928c8c54e71..0a9974017ebaa68a8c777067706b370b76d05314 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 @@ int amdgpu_dm_process_dmub_set_config_sync(struct dc_context *ctx, unsigned int
                                        struct set_config_cmd_payload *payload, enum set_config_status *operation_result);
 
 struct dc_stream_state *
-       create_validate_stream_for_sink(struct drm_connector *connector,
+       create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,
                                        const struct drm_display_mode *drm_mode,
                                        const struct dm_connector_state *dm_state,
                                        const struct dc_stream_state *old_stream);

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 3efe798d767447b3437ab6a2e1f36843ebe761db..b9838c472384c2e174b0e754881d2ec4fa4db38e 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
@@ -1501,6 +1501,7 @@ int pre_validate_dsc(struct drm_atomic_state *state,
 
                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;
@@ -1508,14 +1509,15 @@ int pre_validate_dsc(struct drm_atomic_state *state,
                        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,
-                                                                  connector);
+                                                                  &aconnector->base);
                        dm_new_conn_state = to_dm_connector_state(drm_new_conn_state);
                        dm_old_crtc_state = to_dm_crtc_state(state->crtcs[ind].old_state);
 
                        local_dc_state->streams[i] =
-                               create_validate_stream_for_sink(connector,
+                               create_validate_stream_for_sink(aconnector,
                                                                &state->crtcs[ind].new_state->mode,
                                                                dm_new_conn_state,
                                                                dm_old_crtc_state->stream);