drm/i915: Index min_{cdclk,voltage_level}[] with pipe

min_cdclk[] and min_voltage_level[] are supposed to be indexed
with the pipe. Fix up a few cases where we index via the crtc
index (via the atomic iterators) instead.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210204020846.2094-1-ville.syrjala@linux.intel.com
Reviewed-by: Mika Kahola <mika.kahola@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index bf83e9e7522720ae16eeb32f40422cdd09154b8f..a9019287f7d510744840a6a340855712bd7522c4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -2145,10 +2145,10 @@ static int intel_compute_min_cdclk(struct intel_cdclk_state *cdclk_state)
                if (IS_ERR(bw_state))
                        return PTR_ERR(bw_state);
 
-               if (cdclk_state->min_cdclk[i] == min_cdclk)
+               if (cdclk_state->min_cdclk[crtc->pipe] == min_cdclk)
                        continue;
 
-               cdclk_state->min_cdclk[i] = min_cdclk;
+               cdclk_state->min_cdclk[crtc->pipe] = min_cdclk;
 
                ret = intel_atomic_lock_global_state(&cdclk_state->base);
                if (ret)
@@ -2199,10 +2199,10 @@ static int bxt_compute_min_voltage_level(struct intel_cdclk_state *cdclk_state)
                else
                        min_voltage_level = 0;
 
-               if (cdclk_state->min_voltage_level[i] == min_voltage_level)
+               if (cdclk_state->min_voltage_level[crtc->pipe] == min_voltage_level)
                        continue;
 
-               cdclk_state->min_voltage_level[i] = min_voltage_level;
+               cdclk_state->min_voltage_level[crtc->pipe] = min_voltage_level;
 
                ret = intel_atomic_lock_global_state(&cdclk_state->base);
                if (ret)