drm/amd/powerplay: add display_config to handle display config for SMU11.

add display_config to support sys interface for SMU11.

Signed-off-by: Chengming Gui <Jack.Gui@amd.com>
Reviewed-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 f0e5bfc0deeb1af27c6ce87901c01bff19defd7f..2a8669c89539b5dc9b8087ff817b78388e335425 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -349,6 +349,7 @@ static int smu_sw_init(void *handle)
        smu->workload_setting[4] = PP_SMC_POWER_PROFILE_VR;
        smu->workload_setting[5] = PP_SMC_POWER_PROFILE_COMPUTE;
        smu->workload_setting[6] = PP_SMC_POWER_PROFILE_CUSTOM;
+       smu->display_config = &adev->pm.pm_display_cfg;
 
        ret = smu_init_microcode(smu);
        if (ret) {

diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index 2c3ce9c3bfd48a1e7e0873edb2b6473f64d72895..5ea8bee1de70e65d1d8df49e2c6d54dd3fb5e201 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@ -349,6 +349,7 @@ struct smu_context
        struct smu_dpm_context          smu_dpm;
        struct smu_power_context        smu_power;
        struct smu_feature              smu_feature;
+       struct amd_pp_display_configuration  *display_config;
 
        uint32_t pstate_sclk;
        uint32_t pstate_mclk;

diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index 63cadb69c5486274f29c0422264155cba2f635f7..93552d8c39fb4cd67cbfe075f4d63ff160d55b9c 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -338,7 +338,6 @@ static int smu_v11_0_fini_smc_tables(struct smu_context *smu)
        if (ret)
                return ret;
        return 0;
-
 }
 
 static int smu_v11_0_init_power(struct smu_context *smu)