Merge tag 'drm-next-5.6-2019-12-11' of git://people.freedesktop.org/~agd5f/linux...

[platform/kernel/linux-rpi.git] / drivers / gpu / drm / radeon / si_dpm.c

diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index 720a348..05e8b4d 100644 (file)
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -3639,14 +3639,13 @@ static int si_notify_smc_display_change(struct radeon_device *rdev,
 
 static void si_program_response_times(struct radeon_device *rdev)
 {
-       u32 voltage_response_time, backbias_response_time, acpi_delay_time, vbi_time_out;
+       u32 voltage_response_time, acpi_delay_time, vbi_time_out;
        u32 vddc_dly, acpi_dly, vbi_dly;
        u32 reference_clock;
 
        si_write_smc_soft_register(rdev, SI_SMC_SOFT_REGISTER_mvdd_chg_time, 1);
 
        voltage_response_time = (u32)rdev->pm.dpm.voltage_response_time;
-       backbias_response_time = (u32)rdev->pm.dpm.backbias_response_time;
 
        if (voltage_response_time == 0)
                voltage_response_time = 1000;
@@ -5899,7 +5898,7 @@ static int si_patch_single_dependency_table_based_on_leakage(struct radeon_devic
 
 static int si_patch_dependency_tables_based_on_leakage(struct radeon_device *rdev)
 {
-       int ret = 0;
+       int ret;
 
        ret = si_patch_single_dependency_table_based_on_leakage(rdev,
                                                                &rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk);