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

drm/amd/powerplay: maximize code sharing between .hw_init and .resume 



Then 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 4e8cb0c0

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

+18 −24
Original line number Diff line number Diff line
@@ -1193,10 +1193,28 @@ static int smu_smc_table_hw_init(struct smu_context *smu, 
	 * Set PMSTATUSLOG table bo address with SetToolsDramAddr MSG for tools.

	 */

	ret = smu_set_tool_table_location(smu);

	if (ret)

		return ret;



	if (!smu_is_dpm_running(smu))

		pr_info("dpm has been disabled\n");



	/*

	 * Use msg SetSystemVirtualDramAddr and DramLogSetDramAddr can notify

	 * pool location.

	 */

	ret = smu_notify_memory_pool_location(smu);

	if (ret)

		return ret;



	ret = smu_enable_thermal_alert(smu);

	if (ret)

		return ret;



	ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);

	if (ret)

		return ret;



	return ret;

}
@@ -1276,22 +1294,6 @@ static int smu_hw_init(void *handle) 
	if (ret)

		goto failed;



	/*

	 * Use msg SetSystemVirtualDramAddr and DramLogSetDramAddr can notify

	 * pool location.

	 */

	ret = smu_notify_memory_pool_location(smu);

	if (ret)

		goto failed;



	ret = smu_enable_thermal_alert(smu);

	if (ret)

		goto failed;



	ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);

	if (ret)

		goto failed;



	adev->pm.dpm_enabled = true;



	pr_info("SMU is initialized successfully!\n");
@@ -1488,14 +1490,6 @@ static int smu_resume(void *handle) 
	if (ret)

		goto failed;



	ret = smu_enable_thermal_alert(smu);

	if (ret)

		goto failed;



	ret = smu_i2c_eeprom_init(smu, &adev->pm.smu_i2c);

	if (ret)

		goto failed;



	if (smu->is_apu)

		smu_set_gfx_cgpg(&adev->smu, true);