From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: Erik Gilling <konkers@android.com>,
Maarten Lankhorst <maarten.lankhorst@canonical.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Rob Clark <robclark@gmail.com>,
Sumit Semwal <sumit.semwal@linaro.org>,
Greg KH <gregkh@linuxfoundation.org>,
dri-devel@lists.freedesktop.org,
Android Kernel Team <kernel-team@android.com>,
John Stultz <john.stultz@linaro.org>
Subject: [PATCH 03/30] staging: sync: Add timestamps to sync_pts
Date: Thu, 28 Feb 2013 16:42:59 -0800 [thread overview]
Message-ID: <1362098606-26469-4-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1362098606-26469-1-git-send-email-john.stultz@linaro.org>
From: Erik Gilling <konkers@android.com>
Add ktime timestamps to sync_pt structure and
update them when signaled
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: Greg KH <gregkh@linuxfoundation.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>
---
drivers/staging/android/sync.c | 5 +++++
drivers/staging/android/sync.h | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index 4a9e63d..88d7e66 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -155,12 +155,17 @@ void sync_pt_free(struct sync_pt *pt)
/* call with pt->parent->active_list_lock held */
static int _sync_pt_has_signaled(struct sync_pt *pt)
{
+ int old_status = pt->status;
+
if (!pt->status)
pt->status = pt->parent->ops->has_signaled(pt);
if (!pt->status && pt->parent->destroyed)
pt->status = -ENOENT;
+ if (pt->status != old_status)
+ pt->timestamp = ktime_get();
+
return pt->status;
}
diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index 388acd1..a8e289d 100644
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -16,6 +16,7 @@
#include <linux/types.h>
#ifdef __KERNEL__
+#include <linux/ktime.h>
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/wait.h>
@@ -90,6 +91,8 @@ struct sync_timeline {
* @fence: sync_fence to which the sync_pt belongs
* @pt_list: membership in sync_fence.pt_list_head
* @status: 1: signaled, 0:active, <0: error
+ * @timestamp: time which sync_pt status transitioned from active to
+ * singaled or error.
*/
struct sync_pt {
struct sync_timeline *parent;
@@ -102,6 +105,8 @@ struct sync_pt {
/* protected by parent->active_list_lock */
int status;
+
+ ktime_t timestamp;
};
/**
--
1.7.10.4
next prev parent reply other threads:[~2013-03-01 0:51 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-01 0:42 [RFC][PATCH 00/30] staging: Android sync driver John Stultz
2013-03-01 0:42 ` [PATCH 01/30] staging: sync: Add synchronization framework John Stultz
2013-03-01 0:42 ` [PATCH 02/30] staging: sw_sync: Add cpu based sync driver John Stultz
2013-03-01 0:42 ` John Stultz [this message]
2013-03-01 0:43 ` [PATCH 04/30] staging: sync: Add debugfs support John Stultz
2013-03-01 0:43 ` [PATCH 05/30] staging: sw_sync: Add debug support John Stultz
2013-03-01 0:43 ` [PATCH 06/30] staging: sync: Add ioctl to get fence data John Stultz
2013-03-01 0:43 ` [PATCH 07/30] staging: sw_sync: Add fill_driver_data support John Stultz
2013-03-01 0:43 ` [PATCH 08/30] staging: sync: Add poll support John Stultz
2013-03-01 0:43 ` [PATCH 09/30] staging: sync: Allow async waits to be canceled John Stultz
2013-03-01 0:43 ` [PATCH 10/30] staging: sync: Export sync API symbols John Stultz
2013-03-01 2:00 ` Greg KH
2013-03-01 3:59 ` John Stultz
2013-03-01 8:21 ` Erik Gilling
2013-03-01 13:55 ` Greg KH
2013-03-01 16:30 ` Erik Gilling
2013-03-01 22:47 ` Erik Gilling
2013-03-01 0:43 ` [PATCH 11/30] staging: sw_sync: Export sw_sync API John Stultz
2013-03-01 0:43 ` [PATCH 12/30] staging: sync: Reorder sync_fence_release John Stultz
2013-03-01 0:43 ` [PATCH 13/30] staging: sync: Optimize fence merges John Stultz
2013-03-01 0:43 ` [PATCH 14/30] staging: sync: Add internal refcounting to fences John Stultz
2013-03-01 0:43 ` [PATCH 15/30] staging: sync: Add reference counting to timelines John Stultz
2013-03-01 0:43 ` [PATCH 16/30] staging: sync: Fix error paths John Stultz
2013-03-01 0:43 ` [PATCH 17/30] staging: sw_sync: " John Stultz
2013-03-01 0:43 ` [PATCH 18/30] staging: sync: Change wait timeout to mirror poll semantics John Stultz
2013-03-01 0:43 ` [PATCH 19/30] staging: sync: Dump sync state to console on timeout John Stultz
2013-03-01 0:43 ` [PATCH 20/30] staging: sync: Improve timeout dump messages John Stultz
2013-03-01 0:43 ` [PATCH 21/30] staging: sync: Dump sync state on fence errors John Stultz
2013-03-01 0:43 ` [PATCH 22/30] staging: sync: Protect unlocked access to fence status John Stultz
2013-03-01 0:43 ` [PATCH 23/30] staging: sync: Update new fence status with sync_fence_signal_pt John Stultz
2013-03-01 0:43 ` [PATCH 24/30] staging: sync: Use proper barriers when waiting indefinitely John Stultz
2013-03-01 0:43 ` [PATCH 25/30] staging: sync: Refactor sync debug printing John Stultz
2013-03-01 0:43 ` [PATCH 26/30] staging: sw_sync: Convert to use new value_str debug ops John Stultz
2013-03-01 0:43 ` [PATCH 27/30] staging: sync: Add tracepoint support John Stultz
2013-03-01 0:43 ` [PATCH 28/30] staging: sync: Fix race condition between merge and signal John Stultz
2013-03-01 0:43 ` [PATCH 29/30] staging: sync: Don't log wait timeouts when timeout = 0 John Stultz
2013-03-01 0:43 ` [PATCH 30/30] staging: sync: Fix timeout = 0 wait behavior John Stultz
2013-03-01 1:59 ` [RFC][PATCH 00/30] staging: Android sync driver Greg KH
2013-03-01 16:20 ` Erik Gilling
2013-03-03 18:42 ` Daniel Vetter
2013-03-03 18:52 ` animelovin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362098606-26469-4-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-team@android.com \
--cc=konkers@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@canonical.com \
--cc=robclark@gmail.com \
--cc=sumit.semwal@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox