staging: sync: Refactor sync debug printing

Move driver callbacks to fill strings instead of using seq_files.  This
will allow those values to be used in a future tracepoint patch.

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>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index 811cf65eb3eb8032f27c80f4eee0476fe94dbe50..988f2339d70f3fb4a0ef1552243dbc778f9ab3df 100644 (file)
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -847,7 +847,17 @@ static void sync_print_pt(struct seq_file *s, struct sync_pt *pt, bool fence)
                seq_printf(s, "@%ld.%06ld", tv.tv_sec, tv.tv_usec);
        }
 
-       if (pt->parent->ops->print_pt) {
+       if (pt->parent->ops->timeline_value_str &&
+           pt->parent->ops->pt_value_str) {
+               char value[64];
+               pt->parent->ops->pt_value_str(pt, value, sizeof(value));
+               seq_printf(s, ": %s", value);
+               if (fence) {
+                       pt->parent->ops->timeline_value_str(pt->parent, value,
+                                                   sizeof(value));
+                       seq_printf(s, " / %s", value);
+               }
+       } else if (pt->parent->ops->print_pt) {
                seq_printf(s, ": ");
                pt->parent->ops->print_pt(s, pt);
        }
@@ -862,7 +872,11 @@ static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj)
 
        seq_printf(s, "%s %s", obj->name, obj->ops->driver_name);
 
-       if (obj->ops->print_obj) {
+       if (obj->ops->timeline_value_str) {
+               char value[64];
+               obj->ops->timeline_value_str(obj, value, sizeof(value));
+               seq_printf(s, ": %s", value);
+       } else if (obj->ops->print_obj) {
                seq_printf(s, ": ");
                obj->ops->print_obj(s, obj);
        }

diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index 75ed5f1b75dab801790dd1d352f1d0e2ba7f7a71..38ea986dc70f84dc72c38918f3a3b07d26e75ff4 100644 (file)
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -40,14 +40,14 @@ struct sync_fence;
  *                      -1 if a will signabl before b
  * @free_pt:           called before sync_pt is freed
  * @release_obj:       called before sync_timeline is freed
- * @print_obj:         print aditional debug information about sync_timeline.
- *                       should not print a newline
- * @print_pt:          print aditional debug information about sync_pt.
- *                       should not print a newline
+ * @print_obj:         deprecated
+ * @print_pt:          deprecated
  * @fill_driver_data:  write implmentation specific driver data to data.
  *                       should return an error if there is not enough room
  *                       as specified by size.  This information is returned
  *                       to userspace by SYNC_IOC_FENCE_INFO.
+ * @timeline_value_str: fill str with the value of the sync_timeline's counter
+ * @pt_value_str:      fill str with the value of the sync_pt
  */
 struct sync_timeline_ops {
        const char *driver_name;
@@ -67,15 +67,22 @@ struct sync_timeline_ops {
        /* optional */
        void (*release_obj)(struct sync_timeline *sync_timeline);
 
-       /* optional */
+       /* deprecated */
        void (*print_obj)(struct seq_file *s,
                          struct sync_timeline *sync_timeline);
 
-       /* optional */
+       /* deprecated */
        void (*print_pt)(struct seq_file *s, struct sync_pt *sync_pt);
 
        /* optional */
        int (*fill_driver_data)(struct sync_pt *syncpt, void *data, int size);
+
+       /* optional */
+       void (*timeline_value_str)(struct sync_timeline *timeline, char *str,
+                                  int size);
+
+       /* optional */
+       void (*pt_value_str)(struct sync_pt *pt, char *str, int size);
 };
 
 /**