[Intel-gfx] [PATCH] drm/i915: Use the correct maximum in skl_compute_plane_wm

Maarten Lankhorst maarten.lankhorst at linux.intel.com
Tue Jan 30 13:54:11 UTC 2018


According to bspec, result_lines > 31 is only a maximum for latency
level 1 through 7, so correctly apply the check there.

This is required to make NV12 work.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 26132fa6ebce..f19a3fc2466e 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4805,7 +4805,7 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
 			res_blocks = result_prev->plane_res_b;
 	}
 
-	if (res_blocks >= ddb_allocation || res_lines > 31) {
+	if (res_blocks >= ddb_allocation || (level >= 1 && level <= 7 && res_lines > 31)) {
 		result->plane_en = false;
 
 		/*
-- 
2.15.1



More information about the Intel-gfx mailing list