drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs

Otherwise, the error message prompted will confuse user.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index 34f95e0e3ea45a32a89fe55b343d5c49fdedeed7..203ce4b1028f8d910734f41616f5de83f78b8699 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -3478,18 +3478,31 @@ static int smu7_get_pp_table_entry(struct pp_hwmgr *hwmgr,
 
 static int smu7_get_gpu_power(struct pp_hwmgr *hwmgr, u32 *query)
 {
+       struct amdgpu_device *adev = hwmgr->adev;
        int i;
        u32 tmp = 0;
 
        if (!query)
                return -EINVAL;
 
-       smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_GetCurrPkgPwr, 0);
-       tmp = cgs_read_register(hwmgr->device, mmSMC_MSG_ARG_0);
-       *query = tmp;
+       /*
+        * PPSMC_MSG_GetCurrPkgPwr is not supported on:
+        *  - Hawaii
+        *  - Bonaire
+        *  - Fiji
+        *  - Tonga
+        */
+       if ((adev->asic_type != CHIP_HAWAII) &&
+           (adev->asic_type != CHIP_BONAIRE) &&
+           (adev->asic_type != CHIP_FIJI) &&
+           (adev->asic_type != CHIP_TONGA)) {
+               smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_GetCurrPkgPwr, 0);
+               tmp = cgs_read_register(hwmgr->device, mmSMC_MSG_ARG_0);
+               *query = tmp;
 
-       if (tmp != 0)
-               return 0;
+               if (tmp != 0)
+                       return 0;
+       }
 
        smum_send_msg_to_smc(hwmgr, PPSMC_MSG_PmStatusLogStart);
        cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC,