aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/i915_sw_fence.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
index 1de5173e53a2..6dbeed079ae5 100644
--- a/drivers/gpu/drm/i915/i915_sw_fence.c
+++ b/drivers/gpu/drm/i915/i915_sw_fence.c
@@ -24,13 +24,13 @@ enum {
24 DEBUG_FENCE_NOTIFY, 24 DEBUG_FENCE_NOTIFY,
25}; 25};
26 26
27#ifdef CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS
28
29static void *i915_sw_fence_debug_hint(void *addr) 27static void *i915_sw_fence_debug_hint(void *addr)
30{ 28{
31 return (void *)(((struct i915_sw_fence *)addr)->flags & I915_SW_FENCE_MASK); 29 return (void *)(((struct i915_sw_fence *)addr)->flags & I915_SW_FENCE_MASK);
32} 30}
33 31
32#ifdef CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS
33
34static struct debug_obj_descr i915_sw_fence_debug_descr = { 34static struct debug_obj_descr i915_sw_fence_debug_descr = {
35 .name = "i915_sw_fence", 35 .name = "i915_sw_fence",
36 .debug_hint = i915_sw_fence_debug_hint, 36 .debug_hint = i915_sw_fence_debug_hint,
@@ -393,10 +393,11 @@ static void timer_i915_sw_fence_wake(struct timer_list *t)
393 if (!fence) 393 if (!fence)
394 return; 394 return;
395 395
396 pr_warn("asynchronous wait on fence %s:%s:%x timed out\n", 396 pr_notice("Asynchronous wait on fence %s:%s:%x timed out (hint:%pS)\n",
397 cb->dma->ops->get_driver_name(cb->dma), 397 cb->dma->ops->get_driver_name(cb->dma),
398 cb->dma->ops->get_timeline_name(cb->dma), 398 cb->dma->ops->get_timeline_name(cb->dma),
399 cb->dma->seqno); 399 cb->dma->seqno,
400 i915_sw_fence_debug_hint(fence));
400 401
401 i915_sw_fence_complete(fence); 402 i915_sw_fence_complete(fence);
402} 403}