drm/amd/amdgpu: Fix return values in SI DPM code
authorTom St Denis <tom.stdenis@amd.com>
Wed, 7 Sep 2016 12:42:41 +0000 (08:42 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 14 Sep 2016 19:10:26 +0000 (15:10 -0400)
Fix a couple of spots where errors were not returned as
well as add some error messages to
si_patch_dependency_based_on_leakage() which were not being
read.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/si_dpm.c

index 92a041755e8e12f30d79df22f2a1cc775d7c20b3..e4f7c103fa31fc04210d21f91a58200e09f9d7a1 100644 (file)
@@ -2824,7 +2824,7 @@ done_free:
 
        kfree(cac_tables);
 
-       return 0;
+       return ret;
 }
 
 static int si_program_cac_config_registers(struct amdgpu_device *adev,
@@ -6376,10 +6376,16 @@ static int si_patch_dependency_tables_based_on_leakage(struct amdgpu_device *ade
 
        ret = si_patch_single_dependency_table_based_on_leakage(adev,
                                                                &adev->pm.dpm.dyn_state.vddc_dependency_on_sclk);
+       if (ret)
+               DRM_ERROR("Could not patch vddc_on_sclk leakage table\n");
        ret = si_patch_single_dependency_table_based_on_leakage(adev,
                                                                &adev->pm.dpm.dyn_state.vddc_dependency_on_mclk);
+       if (ret)
+               DRM_ERROR("Could not patch vddc_on_mclk leakage table\n");
        ret = si_patch_single_dependency_table_based_on_leakage(adev,
                                                                &adev->pm.dpm.dyn_state.vddci_dependency_on_mclk);
+       if (ret)
+               DRM_ERROR("Could not patch vddci_on_mclk leakage table\n");
        return ret;
 }
 
@@ -6542,7 +6548,7 @@ static int si_thermal_setup_fan_table(struct amdgpu_device *adev)
                adev->pm.dpm.fan.ucode_fan_control = false;
        }
 
-       return 0;
+       return ret;
 }
 
 static int si_fan_ctrl_start_smc_fan_control(struct amdgpu_device *adev)