summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorChris Wilson2010-11-21 14:12:35 +0100
committerChris Wilson2010-11-22 09:08:19 +0100
commitc4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287 (patch)
tree6b8c839478c8cf8a8fb1a6b02f32a03878247a94 /drivers/gpu/drm/i915/i915_drv.h
parentdrm/i915: Capture pinned buffers on error (diff)
downloadkernel-qcow2-linux-c4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287.tar.gz
kernel-qcow2-linux-c4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287.tar.xz
kernel-qcow2-linux-c4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287.zip
drm/i915: Capture interesting display registers on error
When trying to diagnose mysterious errors on resume, capture the display register contents as well. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 826c7237409b..4c20ad92c0f3 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -140,6 +140,8 @@ struct sdvo_device_mapping {
u8 ddc_pin;
};
+struct intel_display_error_state;
+
struct drm_i915_error_state {
u32 eir;
u32 pgtbl_er;
@@ -187,6 +189,7 @@ struct drm_i915_error_state {
} *active_bo, *pinned_bo;
u32 active_bo_count, pinned_bo_count;
struct intel_overlay_error_state *overlay;
+ struct intel_display_error_state *display;
};
struct drm_i915_display_funcs {
@@ -1223,6 +1226,11 @@ extern int intel_trans_dp_port_sel (struct drm_crtc *crtc);
#ifdef CONFIG_DEBUG_FS
extern struct intel_overlay_error_state *intel_overlay_capture_error_state(struct drm_device *dev);
extern void intel_overlay_print_error_state(struct seq_file *m, struct intel_overlay_error_state *error);
+
+extern struct intel_display_error_state *intel_display_capture_error_state(struct drm_device *dev);
+extern void intel_display_print_error_state(struct seq_file *m,
+ struct drm_device *dev,
+ struct intel_display_error_state *error);
#endif
/**