diff options
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/tegra/host/host1x/host1x_syncpt.c | 3 | ||||
| -rw-r--r-- | drivers/video/tegra/host/nvhost_syncpt.c | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/video/tegra/host/host1x/host1x_syncpt.c b/drivers/video/tegra/host/host1x/host1x_syncpt.c index d0de49463993..967bc6fe442c 100644 --- a/drivers/video/tegra/host/host1x/host1x_syncpt.c +++ b/drivers/video/tegra/host/host1x/host1x_syncpt.c @@ -20,6 +20,7 @@ #include <linux/nvhost_ioctl.h> #include <linux/io.h> +#include <trace/events/nvhost.h> #include "nvhost_syncpt.h" #include "nvhost_acm.h" #include "dev.h" @@ -124,6 +125,8 @@ static int t20_syncpt_wait_check(struct nvhost_syncpt *sp, u32 override; BUG_ON(wait->syncpt_id >= NV_HOST1X_SYNCPT_NB_PTS); + trace_nvhost_syncpt_wait_check(wait->mem, wait->offset, + wait->syncpt_id, wait->thresh); if (nvhost_syncpt_is_expired(sp, wait->syncpt_id, wait->thresh)) { /* diff --git a/drivers/video/tegra/host/nvhost_syncpt.c b/drivers/video/tegra/host/nvhost_syncpt.c index d69883ee51b2..59788084e3c2 100644 --- a/drivers/video/tegra/host/nvhost_syncpt.c +++ b/drivers/video/tegra/host/nvhost_syncpt.c @@ -21,6 +21,7 @@ #include <linux/nvhost_ioctl.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <trace/events/nvhost.h> #include "nvhost_syncpt.h" #include "nvhost_acm.h" #include "dev.h" @@ -70,9 +71,14 @@ void nvhost_syncpt_save(struct nvhost_syncpt *sp) */ u32 nvhost_syncpt_update_min(struct nvhost_syncpt *sp, u32 id) { + u32 val; + BUG_ON(!syncpt_op(sp).update_min); - return syncpt_op(sp).update_min(sp, id); + val = syncpt_op(sp).update_min(sp, id); + trace_nvhost_syncpt_update_min(id, val); + + return val; } /** |