aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2013-08-08 17:28:56 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-08-09 04:45:57 -0400
commita658b5d20de78435a971f26d56a765fb40f88e16 (patch)
tree292a3007cc78e968e2862f1b35cbbdaaf02780f2
parentc55651b39a1fad0a6f07692971249eb54febfd73 (diff)
drm/i915: Make i915_hangcheck_elapsed() static
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h1
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 3480f3b22366..6abf8f9d9b14 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1665,7 +1665,6 @@ extern void intel_console_resume(struct work_struct *work);
1665 1665
1666/* i915_irq.c */ 1666/* i915_irq.c */
1667void i915_queue_hangcheck(struct drm_device *dev); 1667void i915_queue_hangcheck(struct drm_device *dev);
1668void i915_hangcheck_elapsed(unsigned long data);
1669void i915_handle_error(struct drm_device *dev, bool wedged); 1668void i915_handle_error(struct drm_device *dev, bool wedged);
1670 1669
1671extern void intel_irq_init(struct drm_device *dev); 1670extern void intel_irq_init(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 6a1c207a296b..8a77faf4927d 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1869,7 +1869,7 @@ ring_stuck(struct intel_ring_buffer *ring, u32 acthd)
1869 * we kick the ring. If we see no progress on three subsequent calls 1869 * we kick the ring. If we see no progress on three subsequent calls
1870 * we assume chip is wedged and try to fix it by resetting the chip. 1870 * we assume chip is wedged and try to fix it by resetting the chip.
1871 */ 1871 */
1872void i915_hangcheck_elapsed(unsigned long data) 1872static void i915_hangcheck_elapsed(unsigned long data)
1873{ 1873{
1874 struct drm_device *dev = (struct drm_device *)data; 1874 struct drm_device *dev = (struct drm_device *)data;
1875 drm_i915_private_t *dev_priv = dev->dev_private; 1875 drm_i915_private_t *dev_priv = dev->dev_private;