diff options
author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2014-08-05 13:07:13 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-07 08:04:08 -0400 |
commit | 885ea5a8132224cf1ae12b8413352e8b893c8842 (patch) | |
tree | 7b139d7ebf7d34bcda8725c97fb38bb3cb23368e /drivers/gpu/drm/i915/i915_drv.h | |
parent | f260fe7b2f8c32e2fb02a36d3b76ef64b61dbdc5 (diff) |
drm/i915: Fix DEIER and GTIER collecting for BDW.
BDW has many other Display Engine interrupts and GT interrupts registers.
Collecting it properly on gpu_error_state.
On debugfs all was properly listed already but besides we were also listing old
DEIER and GTIER that doesn't exist on BDW anymore. This was causing
unclaimed register messages
v2: Fix small issues of first version and don't read DEIER regs when pipe's
power well is disabled
v3: bikeshed accepted: use enum pipe pipe instead of int i for pipe interection
v4: Ben notice previous version was checking for display_power_enabled without
using propper locks. Using _unlocked version isn't reliable and we cannot
get this registers when power well is off. So let's avoid getting all DE_IER
per pipe for now. If someone think this is an useful information it can be
added later.
v5: Ben: put back debugfs stuff that might be coverred by pm_get and use
gen >= 8 trying to predict future.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81701
Cc: Ben Widawsky <ben@bwidawsk.net>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: (v3) Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index ccb97f1f8660..c70b2b67282e 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -314,7 +314,7 @@ struct drm_i915_error_state { | |||
314 | u32 eir; | 314 | u32 eir; |
315 | u32 pgtbl_er; | 315 | u32 pgtbl_er; |
316 | u32 ier; | 316 | u32 ier; |
317 | u32 gtier; | 317 | u32 gtier[4]; |
318 | u32 ccid; | 318 | u32 ccid; |
319 | u32 derrmr; | 319 | u32 derrmr; |
320 | u32 forcewake; | 320 | u32 forcewake; |