drm/amd/display: Reverting "Add connector to the state if DSC debugfs is set"
authorEryk Brol <eryk.brol@amd.com>
Thu, 1 Oct 2020 17:35:42 +0000 (13:35 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 26 Oct 2020 17:27:59 +0000 (13:27 -0400)
This reverts commit c44a22b3128d143a66421004b728eed688c21ee6.

Reason for revert: Patch introduces performance issues and might
cause memory consistency problems with multiple connectors.

Signed-off-by: Eryk Brol <eryk.brol@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 55bac550a4a9692fcc64c12355fe5939c6cdb15f..0d8ee1f480c03fe9b185fa5d15bf2a992eccb5fd 100644 (file)
@@ -892,45 +892,6 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev)
        return 0;
 }
 
-static void amdgpu_check_debugfs_connector_property_change(struct amdgpu_device *adev,
-                                                          struct drm_atomic_state *state)
-{
-       struct drm_connector *connector;
-       struct drm_crtc *crtc;
-       struct amdgpu_dm_connector *amdgpu_dm_connector;
-       struct drm_connector_state *conn_state;
-       struct dm_crtc_state *acrtc_state;
-       struct drm_crtc_state *crtc_state;
-       struct dc_stream_state *stream;
-       struct drm_device *dev = adev_to_drm(adev);
-
-       list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-
-               amdgpu_dm_connector = to_amdgpu_dm_connector(connector);
-               conn_state = connector->state;
-
-               if (!(conn_state && conn_state->crtc))
-                       continue;
-
-               crtc = conn_state->crtc;
-               acrtc_state = to_dm_crtc_state(crtc->state);
-
-               if (!(acrtc_state && acrtc_state->stream))
-                       continue;
-
-               stream = acrtc_state->stream;
-
-               if (amdgpu_dm_connector->dsc_settings.dsc_force_enable ||
-                   amdgpu_dm_connector->dsc_settings.dsc_num_slices_v ||
-                   amdgpu_dm_connector->dsc_settings.dsc_num_slices_h ||
-                   amdgpu_dm_connector->dsc_settings.dsc_bits_per_pixel) {
-                       conn_state = drm_atomic_get_connector_state(state, connector);
-                       crtc_state = drm_atomic_get_crtc_state(state, crtc);
-                       crtc_state->mode_changed = true;
-               }
-       }
-}
-
 static void mmhub_read_system_context(struct amdgpu_device *adev, struct dc_phy_addr_space_config *pa_config)
 {
        uint64_t pt_base;
@@ -984,7 +945,6 @@ static void mmhub_read_system_context(struct amdgpu_device *adev, struct dc_phy_
 
 }
 
-
 static int amdgpu_dm_init(struct amdgpu_device *adev)
 {
        struct dc_init_data init_data;
@@ -8712,8 +8672,6 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
        int ret, i;
        bool lock_and_validation_needed = false;
 
-       amdgpu_check_debugfs_connector_property_change(adev, state);
-
        ret = drm_atomic_helper_check_modeset(dev, state);
        if (ret)
                goto fail;