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

Commit 09c381e0 authored by Mikita Lipski's avatar Mikita Lipski Committed by Alex Deucher
Browse files

drm/amdgpu: Unify the dm resume calls into one 



amdgpu_dm_display_resume is now called from dm_resume to
unify DAL resume call into a single function call

There is no more need to separately call 2 resume functions
for DM.

Initially they were separated to resume display state after
cursor is pinned. But because there is no longer any corruption
with the cursor - the calls can be merged into one function hook.

Signed-off-by: default avatarMikita Lipski <mikita.lipski@amd.com>
Reviewed-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 5893f6e8

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+0 −9
Original line number Diff line number Diff line
@@ -2284,14 +2284,6 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) 
				drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);

			}

			drm_modeset_unlock_all(dev);

		} else {

			/*

			 * There is no equivalent atomic helper to turn on

			 * display, so we defined our own function for this,

			 * once suspend resume is supported by the atomic

			 * framework this will be reworked

			 */

			amdgpu_dm_display_resume(adev);

		}

	}
@@ -2726,7 +2718,6 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
	if (amdgpu_device_has_dc_support(adev)) {

		if (drm_atomic_helper_resume(adev->ddev, state))

			dev_info(adev->dev, "drm resume failed:%d\n", r);

		amdgpu_dm_display_resume(adev);

	} else {

		drm_helper_resume_force_mode(adev->ddev);

	}

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

+3 −1
Original line number Diff line number Diff line
@@ -629,11 +629,13 @@ static int dm_resume(void *handle) 
{

	struct amdgpu_device *adev = handle;

	struct amdgpu_display_manager *dm = &adev->dm;

	int ret = 0;



	/* power on hardware */

	dc_set_power_state(dm->dc, DC_ACPI_CM_POWER_STATE_D0);



	return 0;

	ret = amdgpu_dm_display_resume(adev);

	return ret;

}



int amdgpu_dm_display_resume(struct amdgpu_device *adev)