drm/amd/pm: fix uninitialized variable warning for smu8_hwmgr
authorjsg <jsg@openbsd.org>
Mon, 9 Sep 2024 08:33:40 +0000 (08:33 +0000)
committerjsg <jsg@openbsd.org>
Mon, 9 Sep 2024 08:33:40 +0000 (08:33 +0000)
From Tim Huang
1dbce92f325060551f98629e885e18fcc99fa012 in linux-6.6.y/6.6.50
86df36b934640866eb249a4488abb148b985a0d9 in mainline linux

sys/dev/pci/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c

index 20a844b..b3373ca 100644 (file)
@@ -584,6 +584,7 @@ static int smu8_init_uvd_limit(struct pp_hwmgr *hwmgr)
                                hwmgr->dyn_state.uvd_clock_voltage_dependency_table;
        unsigned long clock = 0;
        uint32_t level;
+       int ret;
 
        if (NULL == table || table->count <= 0)
                return -EINVAL;
@@ -591,7 +592,9 @@ static int smu8_init_uvd_limit(struct pp_hwmgr *hwmgr)
        data->uvd_dpm.soft_min_clk = 0;
        data->uvd_dpm.hard_min_clk = 0;
 
-       smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetMaxUvdLevel, &level);
+       ret = smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetMaxUvdLevel, &level);
+       if (ret)
+               return ret;
 
        if (level < table->count)
                clock = table->entries[level].vclk;
@@ -611,6 +614,7 @@ static int smu8_init_vce_limit(struct pp_hwmgr *hwmgr)
                                hwmgr->dyn_state.vce_clock_voltage_dependency_table;
        unsigned long clock = 0;
        uint32_t level;
+       int ret;
 
        if (NULL == table || table->count <= 0)
                return -EINVAL;
@@ -618,7 +622,9 @@ static int smu8_init_vce_limit(struct pp_hwmgr *hwmgr)
        data->vce_dpm.soft_min_clk = 0;
        data->vce_dpm.hard_min_clk = 0;
 
-       smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetMaxEclkLevel, &level);
+       ret = smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetMaxEclkLevel, &level);
+       if (ret)
+               return ret;
 
        if (level < table->count)
                clock = table->entries[level].ecclk;
@@ -638,6 +644,7 @@ static int smu8_init_acp_limit(struct pp_hwmgr *hwmgr)
                                hwmgr->dyn_state.acp_clock_voltage_dependency_table;
        unsigned long clock = 0;
        uint32_t level;
+       int ret;
 
        if (NULL == table || table->count <= 0)
                return -EINVAL;
@@ -645,7 +652,9 @@ static int smu8_init_acp_limit(struct pp_hwmgr *hwmgr)
        data->acp_dpm.soft_min_clk = 0;
        data->acp_dpm.hard_min_clk = 0;
 
-       smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetMaxAclkLevel, &level);
+       ret = smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetMaxAclkLevel, &level);
+       if (ret)
+               return ret;
 
        if (level < table->count)
                clock = table->entries[level].acpclk;