summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorPrashant Malani <pmalani@nvidia.com>2012-05-15 10:45:23 -0700
committerVarun Wadekar <vwadekar@nvidia.com>2012-06-26 11:31:55 +0530
commit891f5d70a330ec9b1dca2620a030d0b4dd3b1a2f (patch)
tree496da3046fd1ba5fa94eb9f58e24cf4c230706a6 /drivers/video
parentb13b955e01981a845d8ab42a04f4bf2ea29a38ee (diff)
video: tegra: host: Add context switch to trace dump
Add context switch to the ftrace dump. Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/101523 (cherry picked from commit c74aee528eb8c0bb018f732d3d1e1c7e692149ad) Conflicts: drivers/video/tegra/host/nvhost_cdma.c Change-Id: I794ebc4ccf0746b86dd58160e4c28816771fac9a Reviewed-on: http://git-master/r/102637 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Prashant Malani <pmalani@nvidia.com> Tested-by: Prashant Malani <pmalani@nvidia.com> Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/tegra/host/nvhost_cdma.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/tegra/host/nvhost_cdma.c b/drivers/video/tegra/host/nvhost_cdma.c
index c87415bf5ac2..cd69ea20ae80 100644
--- a/drivers/video/tegra/host/nvhost_cdma.c
+++ b/drivers/video/tegra/host/nvhost_cdma.c
@@ -449,9 +449,8 @@ void nvhost_cdma_push_gather(struct nvhost_cdma *cdma,
{
u32 slots_free = cdma->slots_free;
struct push_buffer *pb = &cdma->push_buffer;
-
- BUG_ON(!cdma_pb_op().push_to);
- BUG_ON(!cdma_op().kick);
+ BUG_ON(!cdma_pb_op(cdma).push_to);
+ BUG_ON(!cdma_op(cdma).kick);
if (handle)
trace_write_gather(cdma, handle, offset, op1 & 0xffff);