Op 10-11-17 om 14:37 schreef Greg KH:

On Tue, Nov 07, 2017 at 09:27:49AM +0100, Maarten Lankhorst wrote:

...

Op 05-11-17 om 16:15 schreef gregkh@linuxfoundation.org:

...

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.

thanks,

greg k-h ------------------ original commit in Linus's tree ------------------

From 8777b927b92cf5b6c29f9f9d3c737addea9ac8a7 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst maarten.lankhorst@linux.intel.com Date: Thu, 19 Oct 2017 17:13:40 +0200 Subject: [PATCH] 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

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 Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com Cc: stable@vger.kernel.org #v4.8+ Acked-by: Ville Syrjälä ville.syrjala@linux.intel.com Reviewed-by: Matt Roper matthew.d.roper@intel.com Link: https://patchwork.freedesktop.org/patch/msgid/20171019151341.4579-1-maarten.... (cherry picked from commit 28283f4f359cd7cfa9e65457bb98c507a2cd0cd0) Signed-off-by: Rodrigo Vivi rodrigo.vivi@intel.com

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index fa47285918f4..79fbaf78f604 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -496,7 +496,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;

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 0a09f8ff6aff..cb950752c346 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2716,9 +2716,9 @@ static void ilk_compute_wm_level(const struct drm_i915_private *dev_priv, const struct intel_crtc *intel_crtc, int level, struct intel_crtc_state *cstate,

• 		 struct intel_plane_state *pristate,
  

• 		 struct intel_plane_state *sprstate,
  

• 		 struct intel_plane_state *curstate,
  

• 		 const struct intel_plane_state *pristate,
  

• 		 const struct intel_plane_state *sprstate,
  

• 		 const struct intel_plane_state *curstate,
  	 struct intel_wm_level *result)
  

{ uint16_t pri_latency = dev_priv->wm.pri_latency[level]; @@ -3038,28 +3038,24 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) struct intel_pipe_wm *pipe_wm; struct drm_device *dev = state->dev; const struct drm_i915_private *dev_priv = to_i915(dev);

• struct intel_plane *intel_plane;
• struct intel_plane_state *pristate = NULL;
• struct intel_plane_state *sprstate = NULL;
• struct intel_plane_state *curstate = NULL;

• struct drm_plane *plane;
• const struct drm_plane_state *plane_state;
• const struct intel_plane_state *pristate = NULL;
• const struct intel_plane_state *sprstate = NULL;
• const struct intel_plane_state *curstate = NULL; int level, max_level = ilk_wm_max_level(dev_priv), usable_level; struct ilk_wm_maximums max;

pipe_wm = &cstate->wm.ilk.optimal;

• for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {

• struct intel_plane_state *ps;
  

• ps = intel_atomic_get_existing_plane_state(state,
  

• 					   intel_plane);
  

• if (!ps)
  

• 	continue;
  

• drm_atomic_crtc_state_for_each_plane_state(plane, plane_state, &cstate->base) {

• const struct intel_plane_state *ps = to_intel_plane_state(plane_state);
  

• if (intel_plane->base.type == DRM_PLANE_TYPE_PRIMARY)
  

• if (plane->type == DRM_PLANE_TYPE_PRIMARY)
  pristate = ps;
  

• else if (intel_plane->base.type == DRM_PLANE_TYPE_OVERLAY)
  

• else if (plane->type == DRM_PLANE_TYPE_OVERLAY)
  sprstate = ps;
  

• else if (intel_plane->base.type == DRM_PLANE_TYPE_CURSOR)
  

• else if (plane->type == DRM_PLANE_TYPE_CURSOR)
  curstate = ps;
  

  }

@@ -3081,11 +3077,9 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) if (pipe_wm->sprites_scaled) usable_level = 0;

• ilk_compute_wm_level(dev_priv, intel_crtc, 0, cstate,

• 	     pristate, sprstate, curstate, &pipe_wm->raw_wm[0]);
  

• memset(&pipe_wm->wm, 0, sizeof(pipe_wm->wm));
• pipe_wm->wm[0] = pipe_wm->raw_wm[0];

• ilk_compute_wm_level(dev_priv, intel_crtc, 0, cstate,

• 	     pristate, sprstate, curstate, &pipe_wm->wm[0]);
  

if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) pipe_wm->linetime = hsw_compute_linetime_wm(cstate); @@ -3095,8 +3089,8 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) ilk_compute_wm_reg_maximums(dev_priv, 1, &max);

• for (level = 1; level <= max_level; level++) {

• struct intel_wm_level *wm = &pipe_wm->raw_wm[level];
  

• for (level = 1; level <= usable_level; level++) {

• struct intel_wm_level *wm = &pipe_wm->wm[level];
  

ilk_compute_wm_level(dev_priv, intel_crtc, level, cstate, pristate, sprstate, curstate, wm); @@ -3106,13 +3100,10 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) * register maximums since such watermarks are * always invalid. */

• if (level > usable_level)
  

• 	continue;
  

• if (ilk_validate_wm_level(level, &max, wm))
  

• 	pipe_wm->wm[level] = *wm;
  

• else
  

• 	usable_level = level;
  

• if (!ilk_validate_wm_level(level, &max, wm)) {
  

• 	memset(wm, 0, sizeof(*wm));
  

• 	break;
  

• }
  

  }

return 0;

Is this backport good? I care about this patch and the followup patch, since it fixes a problem some v4.9 users experience.

Now applied thanks.

What is the "followup patch" that I should also apply to the 4.9-stable tree?

Hm, commit b6b178a77210055b153dbc175e4468bd3c7122df in the drm-intel tree, but hold that off for a bit longer, needs a fix in sanitize_watermarks() to work correctly.