drm/amd/display: Explicitly call ->reset for each object

We need to avoid calling reset after detection because the next
commit adds freesync properties on the atomic_state which are set
during detection. Calling reset after this clears them.

The easiest way to accomplish this right now is to call ->reset on
the connector right after creation but before detection. To stay
consistent call ->reset on every other object as well after creation.

v2: Provide better reason for this change in commit msg.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Roman Li <Roman.Li@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@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 6eb7b32fb763f71a58f4ab401387923b2ce38215..33a15a1d818ca2c52c3fcdcfb49b5f1b58cbe715 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1433,8 +1433,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
                goto fail;
        }
 
-       drm_mode_config_reset(dm->ddev);
-
        return 0;
 fail:
        kfree(aencoder);
@@ -3081,6 +3079,11 @@ static int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
 
        drm_plane_helper_add(&aplane->base, &dm_plane_helper_funcs);
 
+       /* Create (reset) the plane state */
+       if (aplane->base.funcs->reset)
+               aplane->base.funcs->reset(&aplane->base);
+
+
        return res;
 }
 
@@ -3116,6 +3119,10 @@ static int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
 
        drm_crtc_helper_add(&acrtc->base, &amdgpu_dm_crtc_helper_funcs);
 
+       /* Create (reset) the plane state */
+       if (acrtc->base.funcs->reset)
+               acrtc->base.funcs->reset(&acrtc->base);
+
        acrtc->max_cursor_width = dm->adev->dm.dc->caps.max_cursor_size;
        acrtc->max_cursor_height = dm->adev->dm.dc->caps.max_cursor_size;
 
@@ -3468,6 +3475,9 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
                        &aconnector->base,
                        &amdgpu_dm_connector_helper_funcs);
 
+       if (aconnector->base.funcs->reset)
+               aconnector->base.funcs->reset(&aconnector->base);
+
        amdgpu_dm_connector_init_helper(
                dm,
                aconnector,