Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96719c54 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

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: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarRoman Li <Roman.Li@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cd8a2ae8

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+12 −2
Original line number Diff line number Diff line
@@ -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,