From 51548c0fe3d3487c277608bb6436882d0f052fae Mon Sep 17 00:00:00 2001
From: Huang Rui <ray.huang@amd.com>
Date: Wed, 24 Jul 2019 14:05:11 -0500
Subject: drm/amdgpu: skip dpm init for renoir
Git-commit: 51548c0fe3d3487c277608bb6436882d0f052fae
Patch-mainline: v5.4-rc1
References: bsc#1152489
Renoir DPM is not functional so far, we skip it for the comment.
Will revert this patch once SMU 12 is functional.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index b9dee9934f0a..d63beff7620e 100644
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -768,6 +768,11 @@ static int smu_late_init(void *handle)
if (!smu->pm_enabled)
return 0;
+
+ /* To be removed after dpm is enabled */
+ if (adev->asic_type == CHIP_RENOIR)
+ return 0;
+
mutex_lock(&smu->mutex);
smu_handle_task(&adev->smu,
smu->smu_dpm.dpm_level,
@@ -1269,6 +1274,10 @@ static int smu_hw_init(void *handle)
if (!smu->pm_enabled)
return 0;
+ /* To be removed after dpm is enabled */
+ if (adev->asic_type == CHIP_RENOIR)
+ return 0;
+
ret = smu_feature_init_dpm(smu);
if (ret)
goto failed;
--
2.28.0