[PATCH] UBUNTU: SAUCE: i915_bpo: Silence the warning about watermark entries not changing

Timo Aaltonen tjaalton at ubuntu.com
Wed May 10 07:22:38 UTC 2017


From: Timo Aaltonen <timo.aaltonen at canonical.com>

BugLink: http://bugs.launchpad.net/bugs/1580272

This will have to do for v4.4, backporting everything from v4.8.6 is just
not feasible.

Signed-off-by: Timo Aaltonen <timo.aaltonen at canonical.com>
---
 ubuntu/i915/intel_pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ubuntu/i915/intel_pm.c b/ubuntu/i915/intel_pm.c
index 320d8e6..c813330 100644
--- a/ubuntu/i915/intel_pm.c
+++ b/ubuntu/i915/intel_pm.c
@@ -3672,7 +3672,7 @@ static void skl_update_other_pipe_wm(struct drm_device *dev,
 		 * because it was really needed, so we expect the WM values to
 		 * be different.
 		 */
-		WARN_ON(!wm_changed);
+//		WARN_ON(!wm_changed);
 
 		skl_compute_wm_results(dev, &pipe_wm, r, intel_crtc);
 		r->dirty[intel_crtc->pipe] = true;
-- 
2.7.4





More information about the kernel-team mailing list