drm/amd/powerplay: enable AGM logging while dpm disabled.

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

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
index 3e11abe9cd0aa0e600fc1733fc04c661f1a14084..deb112485f824bae1e0972c64848be0b4a3a6488 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
@@ -2583,8 +2583,6 @@ static int vega10_enable_dpm_tasks(struct pp_hwmgr *hwmgr)
                        "Failed to configure telemetry!",
                        return tmp_result);
 
-       vega10_set_tools_address(hwmgr->smumgr);
-
        smum_send_msg_to_smc_with_parameter(hwmgr->smumgr,
                        PPSMC_MSG_NumOfDisplays, 0);
 

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
index 21b61315fc40a8f88e0fcfc0b1a9c0ffbf53a30c..9987d5b80d82b846398a69efa3b3463fdccc30fc 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
@@ -491,7 +491,7 @@ static int vega10_smu_init(struct pp_smumgr *smumgr)
        priv->smu_tables.entry[AVFSTABLE].table = kaddr;
        priv->smu_tables.entry[AVFSTABLE].handle = handle;
 
-       tools_size = 0;
+       tools_size = 0x19000;
        if (tools_size) {
                smu_allocate_memory(smumgr->device,
                                tools_size,
@@ -511,6 +511,7 @@ static int vega10_smu_init(struct pp_smumgr *smumgr)
                                        smu_lower_32_bits(mc_addr);
                        priv->smu_tables.entry[TOOLSTABLE].table = kaddr;
                        priv->smu_tables.entry[TOOLSTABLE].handle = handle;
+                       vega10_set_tools_address(smumgr);
                }
        }