Attachment 124091 Details for Bug 95367 – [PATCH for v4.6] drm/i915: Fix watermarks for VLV/CHV

[patch] [PATCH for v4.6] drm/i915: Fix watermarks for VLV/CHV

46-0001-drm-i915-Fix-watermarks-for-VLV-CHV.patch (text/plain), 5.35 KB, created by Ville Syrjala on 2016-05-25 19:42:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2016-05-25 19:42:17 UTC

Size: 5.35 KB

patch

obsolete

>From 33785caddff675ec4a4368a600d2b39244ca094b Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Wed, 9 Mar 2016 19:07:25 +0200
>Subject: [PATCH for v4.6] drm/i915: Fix watermarks for VLV/CHV
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>commit caed361d83b2 upstream
>
>commit 92826fcdfc14 ("drm/i915: Calculate watermark related members in the crtc_state, v4.")
>broke thigns by removing the pre vs. post wm update distinction. We also
>lost the pre plane wm update entirely for VLV/CHV from the crtc enable
>path.
>
>This caused underruns on modeset and plane enable/disable on CHV,
>and often those can lead to a dead pipe.
>
>So let's bring back the pre vs. post thing, and let's toss in an
>explicit wm update to valleyview_crtc_enable() to avoid having to
>put it into the common code.
>
>This is more or less a partial revert of the offending commit.
>
>Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>Cc: drm-intel-fixes@lists.freedesktop.org
>Fixes: 92826fcdfc14 ("drm/i915: Calculate watermark related members in the crtc_state, v4.")
>Signed-off-by: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>Link: http://patchwork.freedesktop.org/patch/msgid/1457543247-13987-4-git-send-email-ville.syrjala@linux.intel.com
>Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>Cc: <stable@vger.kernel.org> # v4.6
>---
> drivers/gpu/drm/i915/intel_atomic.c  |  3 ++-
> drivers/gpu/drm/i915/intel_display.c | 25 +++++++++++++++++--------
> drivers/gpu/drm/i915/intel_drv.h     |  2 +-
> 3 files changed, 20 insertions(+), 10 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
>index 8e579a8505ac..e7c1686e479c 100644
>--- a/drivers/gpu/drm/i915/intel_atomic.c
>+++ b/drivers/gpu/drm/i915/intel_atomic.c
>@@ -96,7 +96,8 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)
> 	crtc_state->update_pipe = false;
> 	crtc_state->disable_lp_wm = false;
> 	crtc_state->disable_cxsr = false;
>-	crtc_state->wm_changed = false;
>+	crtc_state->update_wm_pre = false;
>+	crtc_state->update_wm_post = false;
> 	crtc_state->fb_changed = false;
> 
> 	return &crtc_state->base;
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 0104a06d01fd..c7fc229cb242 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -4796,7 +4796,7 @@ static void intel_post_plane_update(struct intel_crtc *crtc)
> 
> 	crtc->wm.cxsr_allowed = true;
> 
>-	if (pipe_config->wm_changed && pipe_config->base.active)
>+	if (pipe_config->update_wm_post && pipe_config->base.active)
> 		intel_update_watermarks(&crtc->base);
> 
> 	if (atomic->update_fbc)
>@@ -4843,7 +4843,7 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state)
> 			intel_set_memory_cxsr(dev_priv, false);
> 	}
> 
>-	if (!needs_modeset(&pipe_config->base) && pipe_config->wm_changed)
>+	if (!needs_modeset(&pipe_config->base) && pipe_config->update_wm_pre)
> 		intel_update_watermarks(&crtc->base);
> }
> 
>@@ -6210,6 +6210,7 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
> 
> 	intel_crtc_load_lut(crtc);
> 
>+	intel_update_watermarks(crtc);
> 	intel_enable_pipe(intel_crtc);
> 
> 	assert_vblank_disabled(crtc);
>@@ -11833,14 +11834,22 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
> 			 plane->base.id, was_visible, visible,
> 			 turn_off, turn_on, mode_changed);
> 
>-	if (turn_on || turn_off) {
>-		pipe_config->wm_changed = true;
>+	if (turn_on) {
>+		pipe_config->update_wm_pre = true;
>+
>+		/* must disable cxsr around plane enable/disable */
>+		if (plane->type != DRM_PLANE_TYPE_CURSOR)
>+			pipe_config->disable_cxsr = true;
>+	} else if (turn_off) {
>+		pipe_config->update_wm_post = true;
> 
> 		/* must disable cxsr around plane enable/disable */
> 		if (plane->type != DRM_PLANE_TYPE_CURSOR)
> 			pipe_config->disable_cxsr = true;
> 	} else if (intel_wm_need_update(plane, plane_state)) {
>-		pipe_config->wm_changed = true;
>+		/* FIXME bollocks */
>+		pipe_config->update_wm_pre = true;
>+		pipe_config->update_wm_post = true;
> 	}
> 
> 	if (visible || was_visible)
>@@ -11940,7 +11949,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
> 	}
> 
> 	if (mode_changed && !crtc_state->active)
>-		pipe_config->wm_changed = true;
>+		pipe_config->update_wm_post = true;
> 
> 	if (mode_changed && crtc_state->enable &&
> 	    dev_priv->display.crtc_compute_clock &&
>@@ -13453,12 +13462,12 @@ static bool needs_vblank_wait(struct intel_crtc_state *crtc_state)
> 		return true;
> 
> 	/* wm changes, need vblank before final wm's */
>-	if (crtc_state->wm_changed)
>+	if (crtc_state->update_wm_post)
> 		return true;
> 
> 	/*
> 	 * cxsr is re-enabled after vblank.
>-	 * This is already handled by crtc_state->wm_changed,
>+	 * This is already handled by crtc_state->update_wm_post,
> 	 * but added for clarity.
> 	 */
> 	if (crtc_state->disable_cxsr)
>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index 9d0770c23fde..faf180c40f55 100644
>--- a/drivers/gpu/drm/i915/intel_drv.h
>+++ b/drivers/gpu/drm/i915/intel_drv.h
>@@ -378,7 +378,7 @@ struct intel_crtc_state {
> 
> 	bool update_pipe; /* can a fast modeset be performed? */
> 	bool disable_cxsr;
>-	bool wm_changed; /* watermarks are updated */
>+	bool update_wm_pre, update_wm_post; /* watermarks are updated */
> 	bool fb_changed; /* fb on any of the planes is changed */
> 
> 	/* Pipe source size (ie. panel fitter input size)
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 95367: 123650 | 123651 | 123652 | 124090 | 124091

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.