drm/amd/powerplay: add interface to read pptable from vbios

This patch adds interface to read pptable from vbios for smu.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index b78125207b677b7358b914b6f7ad3769e7e11372..145435f05bc28c9ae8ddcd422172adc91fbc7752 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -87,6 +87,17 @@ static int smu_sw_fini(void *handle)
        return 0;
 }
 
+static int smu_smc_table_hw_init(struct smu_context *smu)
+{
+       int ret;
+
+       ret = smu_read_pptable_from_vbios(smu);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
 static int smu_hw_init(void *handle)
 {
        int ret;
@@ -110,13 +121,19 @@ static int smu_hw_init(void *handle)
 
        mutex_lock(&smu->mutex);
 
-       /* TODO */
+       ret = smu_smc_table_hw_init(smu);
+       if (ret)
+               goto failed;
 
        mutex_unlock(&smu->mutex);
 
        pr_info("SMU is initialized successfully!\n");
 
        return 0;
+
+failed:
+       mutex_unlock(&smu->mutex);
+       return ret;
 }
 
 static int smu_hw_fini(void *handle)

diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index 923a923d0050847c55d59b220959f6d2fd2174fe..1e5a784398f80f5c257ffa3a6108bd0cb846877a 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@ -37,6 +37,7 @@ struct smu_funcs
        int (*init_microcode)(struct smu_context *smu);
        int (*load_microcode)(struct smu_context *smu);
        int (*check_fw_status)(struct smu_context *smu);
+       int (*read_pptable_from_vbios)(struct smu_context *smu);
 };
 
 #define smu_init_microcode(smu) \
@@ -45,6 +46,8 @@ struct smu_funcs
        ((smu)->funcs->load_microcode ? (smu)->funcs->load_microcode((smu)) : 0)
 #define smu_check_fw_status(smu) \
        ((smu)->funcs->check_fw_status ? (smu)->funcs->check_fw_status((smu)) : 0)
+#define smu_read_pptable_from_vbios(smu) \
+       ((smu)->funcs->read_pptable_from_vbios ? (smu)->funcs->read_pptable_from_vbios((smu)) : 0)
 
 extern const struct amd_ip_funcs smu_ip_funcs;