drm/radeon/dpm: drop clk/voltage dependency filters for BTC

No longer needed now that the underlying bug was fixed in
e07929810f0a19ddd756558290c7d72827cbfcd9
(drm/radeon/dpm: fix typo in vddci setup for eg/btc).

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=69721

Reviewed-by: Alexandre Demers <alexandre.f.demers@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c
index f81d7ca134db19d12782f2005177639e64b6a44c..b7181607e4212f406f74b75d89f0a62d4ff53b99 100644 (file)
--- a/drivers/gpu/drm/radeon/btc_dpm.c
+++ b/drivers/gpu/drm/radeon/btc_dpm.c
@@ -2099,7 +2099,6 @@ static void btc_apply_state_adjust_rules(struct radeon_device *rdev,
        bool disable_mclk_switching;
        u32 mclk, sclk;
        u16 vddc, vddci;
-       u32 max_sclk_vddc, max_mclk_vddci, max_mclk_vddc;
 
        if ((rdev->pm.dpm.new_active_crtc_count > 1) ||
            btc_dpm_vblank_too_short(rdev))
@@ -2141,39 +2140,6 @@ static void btc_apply_state_adjust_rules(struct radeon_device *rdev,
                        ps->low.vddci = max_limits->vddci;
        }
 
-       /* limit clocks to max supported clocks based on voltage dependency tables */
-       btc_get_max_clock_from_voltage_dependency_table(&rdev->pm.dpm.dyn_state.vddc_dependency_on_sclk,
-                                                       &max_sclk_vddc);
-       btc_get_max_clock_from_voltage_dependency_table(&rdev->pm.dpm.dyn_state.vddci_dependency_on_mclk,
-                                                       &max_mclk_vddci);
-       btc_get_max_clock_from_voltage_dependency_table(&rdev->pm.dpm.dyn_state.vddc_dependency_on_mclk,
-                                                       &max_mclk_vddc);
-
-       if (max_sclk_vddc) {
-               if (ps->low.sclk > max_sclk_vddc)
-                       ps->low.sclk = max_sclk_vddc;
-               if (ps->medium.sclk > max_sclk_vddc)
-                       ps->medium.sclk = max_sclk_vddc;
-               if (ps->high.sclk > max_sclk_vddc)
-                       ps->high.sclk = max_sclk_vddc;
-       }
-       if (max_mclk_vddci) {
-               if (ps->low.mclk > max_mclk_vddci)
-                       ps->low.mclk = max_mclk_vddci;
-               if (ps->medium.mclk > max_mclk_vddci)
-                       ps->medium.mclk = max_mclk_vddci;
-               if (ps->high.mclk > max_mclk_vddci)
-                       ps->high.mclk = max_mclk_vddci;
-       }
-       if (max_mclk_vddc) {
-               if (ps->low.mclk > max_mclk_vddc)
-                       ps->low.mclk = max_mclk_vddc;
-               if (ps->medium.mclk > max_mclk_vddc)
-                       ps->medium.mclk = max_mclk_vddc;
-               if (ps->high.mclk > max_mclk_vddc)
-                       ps->high.mclk = max_mclk_vddc;
-       }
-
        /* XXX validate the min clocks required for display */
 
        if (disable_mclk_switching) {