diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-08-19 03:19:30 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 05:23:55 -0400 |
commit | 3bd3c9329973a93fa3ef5e9840f2fd6fa2889e3f (patch) | |
tree | ff0f4e7631d46664c5c6b9990a283842b597b8b1 /drivers/gpu/drm/i915/i915_drv.h | |
parent | b303cf9542b016e2af3b9d17255a7f93cd790ef5 (diff) |
drm/i915: Compile out error state without DEBUG_FS
Alexander reported that the compilation of intel_overlay.c was failing
due to an inclusion that was only valid with CONFIG_DEBUG_FS. As the
whole error reporting is only useful with debugfs enabled, remove all
the redundant error state collection code when compiling without
CONFIG_DEBUG_FS.
Reported-by: Alexander Lam <lambchop468@gmail.com>
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.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 101607391c4..634e1c463de 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -874,7 +874,6 @@ extern void i915_update_gfx_val(struct drm_i915_private *dev_priv); | |||
874 | 874 | ||
875 | /* i915_irq.c */ | 875 | /* i915_irq.c */ |
876 | void i915_hangcheck_elapsed(unsigned long data); | 876 | void i915_hangcheck_elapsed(unsigned long data); |
877 | void i915_destroy_error_state(struct drm_device *dev); | ||
878 | extern int i915_irq_emit(struct drm_device *dev, void *data, | 877 | extern int i915_irq_emit(struct drm_device *dev, void *data, |
879 | struct drm_file *file_priv); | 878 | struct drm_file *file_priv); |
880 | extern int i915_irq_wait(struct drm_device *dev, void *data, | 879 | extern int i915_irq_wait(struct drm_device *dev, void *data, |
@@ -911,6 +910,12 @@ i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask); | |||
911 | 910 | ||
912 | void intel_enable_asle (struct drm_device *dev); | 911 | void intel_enable_asle (struct drm_device *dev); |
913 | 912 | ||
913 | #ifdef CONFIG_DEBUG_FS | ||
914 | extern void i915_destroy_error_state(struct drm_device *dev); | ||
915 | #else | ||
916 | #define i915_destroy_error_state(x) | ||
917 | #endif | ||
918 | |||
914 | 919 | ||
915 | /* i915_mem.c */ | 920 | /* i915_mem.c */ |
916 | extern int i915_mem_alloc(struct drm_device *dev, void *data, | 921 | extern int i915_mem_alloc(struct drm_device *dev, void *data, |
@@ -1091,8 +1096,10 @@ extern void intel_detect_pch (struct drm_device *dev); | |||
1091 | extern int intel_trans_dp_port_sel (struct drm_crtc *crtc); | 1096 | extern int intel_trans_dp_port_sel (struct drm_crtc *crtc); |
1092 | 1097 | ||
1093 | /* overlay */ | 1098 | /* overlay */ |
1099 | #ifdef CONFIG_DEBUG_FS | ||
1094 | extern struct intel_overlay_error_state *intel_overlay_capture_error_state(struct drm_device *dev); | 1100 | extern struct intel_overlay_error_state *intel_overlay_capture_error_state(struct drm_device *dev); |
1095 | extern void intel_overlay_print_error_state(struct seq_file *m, struct intel_overlay_error_state *error); | 1101 | extern void intel_overlay_print_error_state(struct seq_file *m, struct intel_overlay_error_state *error); |
1102 | #endif | ||
1096 | 1103 | ||
1097 | /** | 1104 | /** |
1098 | * Lock test for when it's just for synchronization of ring access. | 1105 | * Lock test for when it's just for synchronization of ring access. |