UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: fix the watermark result selection on glk/gen10+ 

On these platforms we're supposed to unconditonally pick the method 2
result instead of the minimum.

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181004231600.14101-4-paulo.r.zanoni@intel.com
This commit is contained in:
Paulo Zanoni 2018-10-04 16:15:57 -07:00
parent 91961a850d
commit 077b5820af
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/gpu/drm/i915/intel_pm.c
View File

@ -4672,15 +4672,24 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
} else { } else {
if ((wp->cpp * cstate->base.adjusted_mode.crtc_htotal / if ((wp->cpp * cstate->base.adjusted_mode.crtc_htotal /
wp->dbuf_block_size < 1) && wp->dbuf_block_size < 1) &&
(wp->plane_bytes_per_line / wp->dbuf_block_size < 1)) (wp->plane_bytes_per_line / wp->dbuf_block_size < 1)) {
selected_result = method2; selected_result = method2;
else if (ddb_allocation >= } else if (ddb_allocation >=
fixed16_to_u32_round_up(wp->plane_blocks_per_line)) fixed16_to_u32_round_up(wp->plane_blocks_per_line)) {
selected_result = min_fixed16(method1, method2); if (INTEL_GEN(dev_priv) == 9 &&
else if (latency >= wp->linetime_us) !IS_GEMINILAKE(dev_priv))
selected_result = min_fixed16(method1, method2); selected_result = min_fixed16(method1, method2);
else else
selected_result = method2;
} else if (latency >= wp->linetime_us) {
if (INTEL_GEN(dev_priv) == 9 &&
!IS_GEMINILAKE(dev_priv))
selected_result = min_fixed16(method1, method2);
else
selected_result = method2;
} else {
selected_result = method1; selected_result = method1;
}
} }
res_blocks = fixed16_to_u32_round_up(selected_result) + 1; res_blocks = fixed16_to_u32_round_up(selected_result) + 1;