aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@intel.com>2021-06-22 14:22:10 -0700
committerLucas De Marchi <lucas.demarchi@intel.com>2021-06-25 09:04:48 -0700
commit0bc3a4eda1fb0edd8678c9405ab18d47327650cd (patch)
tree6e9ae71b7a9e4abc595377b97d3ec7bf6128df88
parentdrm/i915/display: fix level 0 adjustement on display ver >= 12 (diff)
downloadlinux-dev-0bc3a4eda1fb0edd8678c9405ab18d47327650cd.tar.xz
linux-dev-0bc3a4eda1fb0edd8678c9405ab18d47327650cd.zip
drm/i915/display: use max_level to control loop
Since we are already loop through the levels to sanitize them, mark what is the real max_level so it can be used in subsequent loop. This makes it simpler to later add the adjustment latency to "valid levels". No change in behavior, just makes the code easier to follow. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210622212210.3746133-2-lucas.demarchi@intel.com
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index bd04e19917bc..74a8863b94c2 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2908,6 +2908,9 @@ static void intel_read_wm_latency(struct drm_i915_private *dev_priv,
if (wm[level] == 0) {
for (i = level + 1; i <= max_level; i++)
wm[i] = 0;
+
+ max_level = level - 1;
+
break;
}
}
@@ -2922,12 +2925,8 @@ static void intel_read_wm_latency(struct drm_i915_private *dev_priv,
if (wm[0] == 0) {
u8 adjust = DISPLAY_VER(dev_priv) >= 12 ? 3 : 2;
- wm[0] += adjust;
- for (level = 1; level <= max_level; level++) {
- if (wm[level] == 0)
- break;
+ for (level = 0; level <= max_level; level++)
wm[level] += adjust;
- }
}
/*