summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android
diff options
context:
space:
mode:
authorErik Gilling <konkers@android.com>2013-02-28 16:43:16 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-04 17:44:08 +0800
commit1d5db2ce93089db91d7997927b4cfd92a88c5aad (patch)
tree13bf1a7f189fc31f48953b6ea878411c7a66a373 /drivers/staging/android
parentf56388f3bd15a853d5718bf31c5d4dbc8f499cbe (diff)
downloadlinux-1d5db2ce93089db91d7997927b4cfd92a88c5aad.tar.bz2
staging: sync: Improve timeout dump messages
Improve the output of the timeout dumps, including the fence pointer. Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com> Cc: Erik Gilling <konkers@android.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Rob Clark <robclark@gmail.com> Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: dri-devel@lists.freedesktop.org Cc: Android Kernel Team <kernel-team@android.com> Signed-off-by: Erik Gilling <konkers@android.com> [jstultz: Added commit message] Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
-rw-r--r--drivers/staging/android/sync.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index d54fa8dd5341..92cdfe8031d1 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -576,6 +576,8 @@ int sync_fence_wait(struct sync_fence *fence, long timeout)
return fence->status;
if (fence->status == 0) {
+ pr_info("fence timeout on [%p] after %dms\n", fence,
+ jiffies_to_msecs(timeout));
sync_dump();
return -ETIME;
}
@@ -849,7 +851,8 @@ static void sync_print_fence(struct seq_file *s, struct sync_fence *fence)
struct list_head *pos;
unsigned long flags;
- seq_printf(s, "%s: %s\n", fence->name, sync_status_str(fence->status));
+ seq_printf(s, "[%p] %s: %s\n", fence, fence->name,
+ sync_status_str(fence->status));
list_for_each(pos, &fence->pt_list_head) {
struct sync_pt *pt =