drm/amdgpu: add powerplay support for CI asics

currently, for CI asics,
use dpm by default, amdgpu.dpm=-1.
when set amdgpu.dpm=1, enable powplay.
when set amdgpu.dpm=0, disable both dpm and powerplay.

when powerplay is stable on CI asics, ci_dpm will
be removed.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index 5cd5b8ee9744bb211a1849e502708b971eebf09f..2d2f0960b0258c6c439dc6e978c763e843b04058 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -93,8 +93,16 @@ static int amdgpu_pp_early_init(void *handle)
 #ifdef CONFIG_DRM_AMDGPU_CIK
        case CHIP_BONAIRE:
        case CHIP_HAWAII:
-               amd_pp->ip_funcs = &ci_dpm_ip_funcs;
-               amd_pp->pp_funcs = &ci_dpm_funcs;
+               if (amdgpu_dpm == -1) {
+                       amd_pp->ip_funcs = &ci_dpm_ip_funcs;
+                       amd_pp->pp_funcs = &ci_dpm_funcs;
+               } else {
+                       adev->pp_enabled = true;
+                       if (amdgpu_create_pp_handle(adev))
+                               return -EINVAL;
+                       amd_pp->ip_funcs = &pp_ip_funcs;
+                       amd_pp->pp_funcs = &pp_dpm_funcs;
+               }
                break;
        case CHIP_KABINI:
        case CHIP_MULLINS: