Commit e6f1eb4c authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/powerplay: maximize code sharing between .hw_fini and .suspend 



Thus redundant code can be dropped.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a35a10d9

drivers/gpu/drm/amd/powerplay/amdgpu_smu.c

+23 −21
Original line number Diff line number Diff line
@@ -1376,6 +1376,26 @@ static int smu_disable_dpms(struct smu_context *smu) 
	return ret;

}



static int smu_smc_hw_cleanup(struct smu_context *smu)

{

	struct amdgpu_device *adev = smu->adev;

	int ret = 0;



	smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);



	ret = smu_disable_thermal_alert(smu);

	if (ret) {

		pr_warn("Fail to stop thermal control!\n");

		return ret;

	}



	ret = smu_disable_dpms(smu);

	if (ret)

		return ret;



	return 0;

}



static int smu_hw_fini(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -1396,19 +1416,9 @@ static int smu_hw_fini(void *handle) 


	adev->pm.dpm_enabled = false;



	smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);



	ret = smu_disable_thermal_alert(smu);

	if (ret) {

		pr_warn("Fail to stop thermal control!\n");

		return ret;

	}



	ret = smu_disable_dpms(smu);

	if (ret) {

		pr_warn("Fail to stop Dpms!\n");

	ret = smu_smc_hw_cleanup(smu);

	if (ret)

		return ret;

	}



	return 0;

}
@@ -1445,15 +1455,7 @@ static int smu_suspend(void *handle) 


	adev->pm.dpm_enabled = false;



	smu_i2c_eeprom_fini(smu, &adev->pm.smu_i2c);



	ret = smu_disable_thermal_alert(smu);

	if (ret) {

		pr_warn("Fail to stop thermal control!\n");

		return ret;

	}



	ret = smu_disable_dpms(smu);

	ret = smu_smc_hw_cleanup(smu);

	if (ret)

		return ret;