Revert "drm/amd/display: Skip writeback connector when we get amdgpu_dm_connector"

This reverts commit 30a24318cc8f4947c6567c78997c8deb546e7a0b.

[WHY & HOW]
The writeback series cause a regression in thunderbolt display.

Signed-off-by: Alex Hung <[email protected]>
Reviewed-by: Harry Wentland <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

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 0a484c9acb6e1ec7b32c80559dfc115ad297cb2d..769f8d6194534758d7f1738ad86a40ce2e450888 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -725,10 +725,6 @@ static void dmub_hpd_callback(struct amdgpu_device *adev,
 
        drm_connector_list_iter_begin(dev, &iter);
        drm_for_each_connector_iter(connector, &iter) {
-
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
                aconnector = to_amdgpu_dm_connector(connector);
                if (link && aconnector->dc_link == link) {
                        if (notify->type == DMUB_NOTIFICATION_HPD)
@@ -953,10 +949,6 @@ static int amdgpu_dm_audio_component_get_eld(struct device *kdev, int port,
 
        drm_connector_list_iter_begin(dev, &conn_iter);
        drm_for_each_connector_iter(connector, &conn_iter) {
-
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
                aconnector = to_amdgpu_dm_connector(connector);
                if (aconnector->audio_inst != port)
                        continue;
@@ -2280,10 +2272,6 @@ static int detect_mst_link_for_all_connectors(struct drm_device *dev)
 
        drm_connector_list_iter_begin(dev, &iter);
        drm_for_each_connector_iter(connector, &iter) {
-
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
                aconnector = to_amdgpu_dm_connector(connector);
                if (aconnector->dc_link->type == dc_connection_mst_branch &&
                    aconnector->mst_mgr.aux) {
@@ -2412,10 +2400,6 @@ static void s3_handle_mst(struct drm_device *dev, bool suspend)
 
        drm_connector_list_iter_begin(dev, &iter);
        drm_for_each_connector_iter(connector, &iter) {
-
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
                aconnector = to_amdgpu_dm_connector(connector);
                if (aconnector->dc_link->type != dc_connection_mst_branch ||
                    aconnector->mst_root)
@@ -2937,10 +2921,6 @@ static int dm_resume(void *handle)
        /* Do detection*/
        drm_connector_list_iter_begin(ddev, &iter);
        drm_for_each_connector_iter(connector, &iter) {
-
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
                aconnector = to_amdgpu_dm_connector(connector);
 
                if (!aconnector->dc_link)
@@ -3514,9 +3494,6 @@ static void register_hpd_handlers(struct amdgpu_device *adev)
        list_for_each_entry(connector,
                        &dev->mode_config.connector_list, head) {
 
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
                aconnector = to_amdgpu_dm_connector(connector);
                dc_link = aconnector->dc_link;
 
@@ -5533,13 +5510,10 @@ static void fill_stream_properties_from_drm_display_mode(
 {
        struct dc_crtc_timing *timing_out = &stream->timing;
        const struct drm_display_info *info = &connector->display_info;
-       struct amdgpu_dm_connector *aconnector = NULL;
+       struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
        struct hdmi_vendor_infoframe hv_frame;
        struct hdmi_avi_infoframe avi_frame;
 
-       if (connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK)
-               aconnector = to_amdgpu_dm_connector(connector);
-
        memset(&hv_frame, 0, sizeof(hv_frame));
        memset(&avi_frame, 0, sizeof(avi_frame));
 
@@ -6979,9 +6953,6 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state,
 
        for_each_new_connector_in_state(state, connector, new_con_state, i) {
 
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
                aconnector = to_amdgpu_dm_connector(connector);
 
                if (!aconnector->mst_output_port)
@@ -8538,9 +8509,6 @@ static void amdgpu_dm_commit_audio(struct drm_device *dev,
                if (!drm_atomic_crtc_needs_modeset(new_crtc_state))
                        continue;
 
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
 notify:
                aconnector = to_amdgpu_dm_connector(connector);
 
@@ -8574,9 +8542,6 @@ notify:
                if (!status)
                        continue;
 
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
                aconnector = to_amdgpu_dm_connector(connector);
 
                mutex_lock(&adev->dm.audio_lock);
@@ -8800,12 +8765,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
        for_each_oldnew_connector_in_state(state, connector, old_con_state, new_con_state, i) {
                struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state);
                struct amdgpu_crtc *acrtc = to_amdgpu_crtc(dm_new_con_state->base.crtc);
-               struct amdgpu_dm_connector *aconnector;
-
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
-               aconnector = to_amdgpu_dm_connector(connector);
+               struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
 
                if (!adev->dm.hdcp_workqueue)
                        continue;
@@ -9199,15 +9159,10 @@ out:
 void dm_restore_drm_connector_state(struct drm_device *dev,
                                    struct drm_connector *connector)
 {
-       struct amdgpu_dm_connector *aconnector;
+       struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
        struct amdgpu_crtc *disconnected_acrtc;
        struct dm_crtc_state *acrtc_state;
 
-       if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-               return;
-
-       aconnector = to_amdgpu_dm_connector(connector);
-
        if (!aconnector->dc_sink || !connector->state || !connector->encoder)
                return;
 
@@ -9284,16 +9239,12 @@ static void get_freesync_config_for_crtc(
        struct dm_connector_state *new_con_state)
 {
        struct mod_freesync_config config = {0};
-       struct amdgpu_dm_connector *aconnector;
+       struct amdgpu_dm_connector *aconnector =
+                       to_amdgpu_dm_connector(new_con_state->base.connector);
        struct drm_display_mode *mode = &new_crtc_state->base.mode;
        int vrefresh = drm_mode_vrefresh(mode);
        bool fs_vid_mode = false;
 
-       if (new_con_state->base.connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-               return;
-
-       aconnector = to_amdgpu_dm_connector(new_con_state->base.connector);
-
        new_crtc_state->vrr_supported = new_con_state->freesync_capable &&
                                        vrefresh >= aconnector->min_vfreq &&
                                        vrefresh <= aconnector->max_vfreq;
@@ -10123,9 +10074,6 @@ static int add_affected_mst_dsc_crtcs(struct drm_atomic_state *state, struct drm
                if (conn_state->crtc != crtc)
                        continue;
 
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
                aconnector = to_amdgpu_dm_connector(connector);
                if (!aconnector->mst_output_port || !aconnector->mst_root)
                        aconnector = NULL;

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 f936a35fa9ebb716b8082d8e53cf0b4053e1a586..52ecfa746b54dd23b4bdc5bfa6d48d3714a31f6b 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
@@ -326,9 +326,6 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name)
                        if (!connector->state || connector->state->crtc != crtc)
                                continue;
 
-                       if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                               continue;
-
                        aconn = to_amdgpu_dm_connector(connector);
                        break;
                }

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
index 58b880acb087ae73352e9ac487d5ccd033f03f4d..51467f132c2604a81ea5cc2e9e30e408d9c2cb38 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
@@ -894,15 +894,10 @@ void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
 
        drm_connector_list_iter_begin(dev, &iter);
        drm_for_each_connector_iter(connector, &iter) {
-               struct amdgpu_dm_connector *amdgpu_dm_connector;
-               const struct dc_link *dc_link;
+               struct amdgpu_dm_connector *amdgpu_dm_connector =
+                               to_amdgpu_dm_connector(connector);
 
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
-               amdgpu_dm_connector = to_amdgpu_dm_connector(connector);
-
-               dc_link = amdgpu_dm_connector->dc_link;
+               const struct dc_link *dc_link = amdgpu_dm_connector->dc_link;
 
                if (dc_link->irq_source_hpd != DC_IRQ_SOURCE_INVALID) {
                        dc_interrupt_set(adev->dm.dc,
@@ -935,14 +930,9 @@ void amdgpu_dm_hpd_fini(struct amdgpu_device *adev)
 
        drm_connector_list_iter_begin(dev, &iter);
        drm_for_each_connector_iter(connector, &iter) {
-               struct amdgpu_dm_connector *amdgpu_dm_connector;
-               const struct dc_link *dc_link;
-
-               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
-                       continue;
-
-               amdgpu_dm_connector = to_amdgpu_dm_connector(connector);
-               dc_link = amdgpu_dm_connector->dc_link;
+               struct amdgpu_dm_connector *amdgpu_dm_connector =
+                               to_amdgpu_dm_connector(connector);
+               const struct dc_link *dc_link = amdgpu_dm_connector->dc_link;
 
                if (dc_link->irq_source_hpd != DC_IRQ_SOURCE_INVALID) {
                        dc_interrupt_set(adev->dm.dc,