From: Paulo Zanoni <przanoni@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 7/7] drm/i915: there's no PIPESTAT on HAS_PCH_SPLIT platforms
Date: Fri, 22 Mar 2013 14:24:16 -0300 [thread overview]
Message-ID: <1363973056-3003-1-git-send-email-przanoni@gmail.com> (raw)
In-Reply-To: <1362611003-4823-10-git-send-email-przanoni@gmail.com>
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
So don't read it when capturing the error state. This solves
"unclaimed register" messages on Haswell when we have a GPU hang.
V2: Check for HAS_PCH_SPLIT instead of Gen5+ because VLV still has
this register.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
drivers/gpu/drm/i915/i915_irq.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 5fc178e..3c2b05c 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1387,8 +1387,9 @@ static void i915_capture_error_state(struct drm_device *dev)
else if (INTEL_INFO(dev)->gen == 6)
error->forcewake = I915_READ(FORCEWAKE);
- for_each_pipe(pipe)
- error->pipestat[pipe] = I915_READ(PIPESTAT(pipe));
+ if (!HAS_PCH_SPLIT(dev))
+ for_each_pipe(pipe)
+ error->pipestat[pipe] = I915_READ(PIPESTAT(pipe));
if (INTEL_INFO(dev)->gen >= 6) {
error->error = I915_READ(ERROR_GEN6);
--
1.7.10.4
next prev parent reply other threads:[~2013-03-22 17:24 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-06 23:03 [PATCH 00/15] More "unclaimed register" fixes Paulo Zanoni
2013-03-06 23:03 ` [PATCH 01/15] drm/i915: only disable DDI sound if intel_crtc->eld_vld Paulo Zanoni
2013-03-07 9:31 ` Ville Syrjälä
2013-03-17 20:17 ` Daniel Vetter
2013-03-17 20:23 ` Daniel Vetter
2013-03-20 22:03 ` Paulo Zanoni
2013-03-20 22:24 ` Daniel Vetter
2013-03-22 17:11 ` [PATCH 2/7] " Paulo Zanoni
2013-03-22 18:11 ` Ville Syrjälä
2013-03-06 23:03 ` [PATCH 02/15] drm/i915: disable sound first on intel_disable_ddi Paulo Zanoni
2013-03-15 18:24 ` Ben Widawsky
2013-03-17 20:25 ` Daniel Vetter
2013-03-06 23:03 ` [PATCH 03/15] drm/i915: add intel_power_well_is_down Paulo Zanoni
2013-03-06 23:26 ` Daniel Vetter
2013-03-06 23:31 ` Daniel Vetter
2013-03-15 18:31 ` Ben Widawsky
2013-03-20 22:21 ` Paulo Zanoni
2013-03-22 17:14 ` [PATCH 3/7] drm/i915: add intel_using_power_well Paulo Zanoni
2013-04-17 9:04 ` Daniel Vetter
2013-04-17 12:27 ` Daniel Vetter
2013-03-06 23:03 ` [PATCH 04/15] drm/i915: don't touch the PF regs if the power well is down Paulo Zanoni
2013-03-06 23:28 ` Daniel Vetter
2013-03-15 18:41 ` Ben Widawsky
2013-03-22 17:16 ` [PATCH 4/7] " Paulo Zanoni
2013-04-12 20:23 ` Daniel Vetter
2013-03-06 23:03 ` [PATCH 05/15] drm/i915: capture the correct cursor registers on IVB Paulo Zanoni
2013-03-07 9:34 ` Ville Syrjälä
2013-03-15 18:45 ` Ben Widawsky
2013-03-17 20:26 ` Daniel Vetter
2013-03-06 23:03 ` [PATCH 06/15] drm/i915: there's no DSPSIZE register on gen4+ Paulo Zanoni
2013-03-07 9:38 ` Ville Syrjälä
2013-03-15 19:04 ` Ben Widawsky
2013-03-15 19:08 ` Ben Widawsky
2013-03-17 20:29 ` Daniel Vetter
2013-03-06 23:03 ` [PATCH 07/15] drm/i915: there's no DSPADDR register on Haswell Paulo Zanoni
2013-03-15 19:10 ` Ben Widawsky
2013-03-17 20:33 ` Daniel Vetter
2013-03-20 18:01 ` Paulo Zanoni
2013-03-20 21:44 ` Daniel Vetter
2013-03-22 17:19 ` [PATCH 5/7] drm/i915: fix DSPADDR Gen check Paulo Zanoni
2013-03-23 12:33 ` Daniel Vetter
2013-03-06 23:03 ` [PATCH 08/15] drm/i915: remove DSPPOS register Paulo Zanoni
2013-03-07 9:43 ` Ville Syrjälä
2013-03-17 20:39 ` Daniel Vetter
2013-03-15 19:13 ` Ben Widawsky
2013-03-22 17:20 ` [PATCH 6/7] drm/i915: there's no DSPPOS register on gen4+ Paulo Zanoni
2013-03-23 12:33 ` Daniel Vetter
2013-03-06 23:03 ` [PATCH 09/15] drm/i915: there's no PIPESTAT on Gen5+ Paulo Zanoni
2013-03-06 23:22 ` Daniel Vetter
2013-03-07 9:19 ` Ville Syrjälä
2013-03-22 17:24 ` Paulo Zanoni [this message]
2013-03-23 12:33 ` [PATCH 7/7] drm/i915: there's no PIPESTAT on HAS_PCH_SPLIT platforms Daniel Vetter
2013-03-06 23:03 ` [PATCH 10/15] drm/i915: check the power well when capturing error state Paulo Zanoni
2013-03-15 19:22 ` Ben Widawsky
2013-03-17 20:46 ` Daniel Vetter
2013-03-17 20:51 ` Daniel Vetter
2013-03-21 22:12 ` Paulo Zanoni
2013-03-22 8:45 ` Daniel Vetter
2013-03-06 23:03 ` [PATCH 11/15] drm/i915: add HAS_POWER_WELL Paulo Zanoni
2013-03-07 17:14 ` Jesse Barnes
2013-03-17 20:49 ` Daniel Vetter
2013-03-06 23:03 ` [PATCH 12/15] drm/i915: reorganize intel_lvds_supported Paulo Zanoni
2013-03-15 20:57 ` Ben Widawsky
2013-03-17 20:52 ` Daniel Vetter
2013-03-06 23:03 ` [PATCH 13/15] drm/i915: don't save/restore PCH_LVDS on LPT Paulo Zanoni
2013-03-15 21:04 ` Ben Widawsky
2013-03-17 20:54 ` Daniel Vetter
2013-03-06 23:03 ` [PATCH 14/15] drm/i915: check the power well on i915_pipe_enabled Paulo Zanoni
2013-03-15 21:06 ` Ben Widawsky
2013-03-17 20:55 ` Daniel Vetter
2013-03-06 23:03 ` [PATCH 15/15] drm/i915: add missing space in error message Paulo Zanoni
2013-03-15 21:10 ` Ben Widawsky
2013-03-17 20:57 ` Daniel Vetter
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=1363973056-3003-1-git-send-email-przanoni@gmail.com \
--to=przanoni@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paulo.r.zanoni@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox