Patch "drm/i915: Do not rely on wm preservation for ILK watermarks" has been added to the 4.13-stable tree

This is a note to let you know that I've just added the patch titled

drm/i915: Do not rely on wm preservation for ILK watermarks

to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-i915-do-not-rely-on-wm-preservation-for-ilk-watermarks.patch
and it can be found in the queue-4.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Maarten Lankhorst <[email protected]>
Date: Thu, 19 Oct 2017 17:13:40 +0200
Subject: drm/i915: Do not rely on wm preservation for ILK watermarks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Maarten Lankhorst <[email protected]>

commit 8777b927b92cf5b6c29f9f9d3c737addea9ac8a7 upstream.

The original intent was to preserve watermarks as much as possible in intel_pipe_wm.raw_wm, and put the validated ones in intel_pipe_wm.wm.

It seems this approach is insufficient and we don't always preserve the raw watermarks, so just use the atomic iterator we're already using to get a const pointer to all bound planes on the crtc.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102373

---
 drivers/gpu/drm/i915/intel_drv.h |    1 
 drivers/gpu/drm/i915/intel_pm.c  |   51 ++++++++++++++++-----------------------
 2 files changed, 21 insertions(+), 31 deletions(-)

@@ -495,7 +495,6 @@ struct intel_crtc_scaler_state {
 
 struct intel_pipe_wm {
 	struct intel_wm_level wm[5];
-	struct intel_wm_level raw_wm[5];
 	uint32_t linetime;
 	bool fbc_wm_enabled;
 	bool pipe_enabled;

Patches currently in stable-queue which might be from [email protected] are

queue-4.13/drm-i915-do-not-rely-on-wm-preservation-for-ilk-watermarks.patch