diff options
author | Mika Kuoppala <mika.kuoppala@linux.intel.com> | 2013-07-12 09:50:57 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-07-12 12:53:13 -0400 |
commit | 84734a049d0ef2f6f5fb0a1fe060cd51480dd855 (patch) | |
tree | a96e3bdd507a1830cdc61688e28f60bd92af3b9e /drivers/gpu/drm/i915/intel_overlay.c | |
parent | 53b914084950e5766b40228c4e08706e28745fa5 (diff) |
drm/i915: move error state to own compilation unit
Move error state generation and stringification to it's
own compilation unit. Sysfs also uses this so it can't be
under CONFIG_DEBUG_FS
This fixes a regression introduced in
commit ef86ddced720fddc3835558447a7f594d3609c73
Author: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Date: Thu Jun 6 17:38:54 2013 +0300
drm/i915: add error_state sysfs entry
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66814
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_overlay.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_overlay.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 81c3ca14fa92..2abb53e6f1e0 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c | |||
@@ -1412,9 +1412,6 @@ void intel_cleanup_overlay(struct drm_device *dev) | |||
1412 | kfree(dev_priv->overlay); | 1412 | kfree(dev_priv->overlay); |
1413 | } | 1413 | } |
1414 | 1414 | ||
1415 | #ifdef CONFIG_DEBUG_FS | ||
1416 | #include <linux/seq_file.h> | ||
1417 | |||
1418 | struct intel_overlay_error_state { | 1415 | struct intel_overlay_error_state { |
1419 | struct overlay_registers regs; | 1416 | struct overlay_registers regs; |
1420 | unsigned long base; | 1417 | unsigned long base; |
@@ -1537,4 +1534,3 @@ intel_overlay_print_error_state(struct drm_i915_error_state_buf *m, | |||
1537 | P(UVSCALEV); | 1534 | P(UVSCALEV); |
1538 | #undef P | 1535 | #undef P |
1539 | } | 1536 | } |
1540 | #endif | ||