From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH (resend) 1/3] drm/i915: Ignore previous watermarks on ILK if inherited
Date: Wed, 8 Nov 2017 10:29:20 +0100 [thread overview]
Message-ID: <20171108092922.58142-1-maarten.lankhorst@linux.intel.com> (raw)
Fixes the following error when fastset is enabled, caught by CI:
[drm:ilk_validate_wm_level.part.8 [i915]] Sprite WM0 too large 56 (max 0)
[drm:ilk_validate_pipe_wm [i915]] LP0 watermark invalid
[drm:intel_crtc_atomic_check [i915]] No valid intermediate pipe watermarks are possible
Triggered on debugfs_test.read_all_entries, but could have been any igt
test depending on ordering.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 46440e2ecb33..9e8a0a9cac02 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3137,7 +3137,9 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev,
* and after the vblank.
*/
*a = newstate->wm.ilk.optimal;
- if (!newstate->base.active || drm_atomic_crtc_needs_modeset(&newstate->base))
+ if (!newstate->base.active ||
+ drm_atomic_crtc_needs_modeset(&newstate->base) ||
+ oldstate->base.mode.private_flags & I915_MODE_FLAG_INHERITED)
return 0;
a->pipe_enabled |= b->pipe_enabled;
--
2.15.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2017-11-08 9:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-08 9:29 Maarten Lankhorst [this message]
2017-11-08 9:29 ` [PATCH 2/3] drm/i915: Enable FIFO underrun reporting after initial fastset Maarten Lankhorst
2017-11-08 15:38 ` Daniel Vetter
2017-11-08 16:15 ` Maarten Lankhorst
2017-11-08 17:50 ` Maarten Lankhorst
2017-11-08 9:29 ` [PATCH (resend) 3/3] drm/i915: Re-enable fastboot by default Maarten Lankhorst
2017-11-08 15:46 ` Daniel Vetter
2017-11-08 10:41 ` ✓ Fi.CI.BAT: success for series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited Patchwork
2017-11-08 11:26 ` ✓ Fi.CI.IGT: " Patchwork
2017-11-08 11:35 ` ✗ Fi.CI.BAT: warning " Patchwork
2017-11-08 12:15 ` Patchwork
2017-11-08 12:18 ` Patchwork
2017-11-08 15:41 ` [PATCH (resend) 1/3] " Daniel Vetter
2017-11-08 16:09 ` Maarten Lankhorst
2017-11-09 10:41 ` Daniel Vetter
2017-11-09 14:20 ` Maarten Lankhorst
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171108092922.58142-1-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.