|
@@ -24,13 +24,13 @@ enum {
|
|
|
DEBUG_FENCE_NOTIFY,
|
|
|
};
|
|
|
|
|
|
-#ifdef CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS
|
|
|
-
|
|
|
static void *i915_sw_fence_debug_hint(void *addr)
|
|
|
{
|
|
|
return (void *)(((struct i915_sw_fence *)addr)->flags & I915_SW_FENCE_MASK);
|
|
|
}
|
|
|
|
|
|
+#ifdef CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS
|
|
|
+
|
|
|
static struct debug_obj_descr i915_sw_fence_debug_descr = {
|
|
|
.name = "i915_sw_fence",
|
|
|
.debug_hint = i915_sw_fence_debug_hint,
|
|
@@ -393,10 +393,11 @@ static void timer_i915_sw_fence_wake(struct timer_list *t)
|
|
|
if (!fence)
|
|
|
return;
|
|
|
|
|
|
- pr_warn("asynchronous wait on fence %s:%s:%x timed out\n",
|
|
|
- cb->dma->ops->get_driver_name(cb->dma),
|
|
|
- cb->dma->ops->get_timeline_name(cb->dma),
|
|
|
- cb->dma->seqno);
|
|
|
+ pr_notice("Asynchronous wait on fence %s:%s:%x timed out (hint:%pS)\n",
|
|
|
+ cb->dma->ops->get_driver_name(cb->dma),
|
|
|
+ cb->dma->ops->get_timeline_name(cb->dma),
|
|
|
+ cb->dma->seqno,
|
|
|
+ i915_sw_fence_debug_hint(fence));
|
|
|
|
|
|
i915_sw_fence_complete(fence);
|
|
|
}
|