Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com> On 10/30/2017 11:10 AM, Harry Wentland wrote: > 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 at amd.com> > Reviewed-by: Roman Li <Roman.Li at amd.com> > Acked-by: Harry Wentland <harry.wentland at amd.com> > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > 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 d2d34e83a956..f01812bf59e9 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -1438,8 +1438,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); > @@ -3115,6 +3113,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; > } > > @@ -3150,6 +3153,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; > > @@ -3510,6 +3517,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,
