video: tegra: host: gk20a: Trace cmdbuf flag

This patch modifies the gk20a driver to use its own "trace cmdbuf"
flag while tracing.

Bug 1468086

Change-Id: I5558514dc920996a1c785cebd99e52db0ab1908a
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-on: http://git-master/r/380931
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

diff --git a/drivers/video/tegra/host/gk20a/channel_gk20a.c b/drivers/video/tegra/host/gk20a/channel_gk20a.c
index 2a6f0b421db4bfa8d2eea1c4731e2bdc5da40918..f0898f2b63c1b498047e1dbf818793c06911b2d0 100644 (file)
--- a/drivers/video/tegra/host/gk20a/channel_gk20a.c
+++ b/drivers/video/tegra/host/gk20a/channel_gk20a.c
@@ -29,7 +29,7 @@
 #include <linux/dma-buf.h>
 
 #include "dev.h"
-#include "debug.h"
+#include "debug_gk20a.h"
 
 #include "gk20a.h"
 #include "dbg_gpu_gk20a.h"
@@ -1315,7 +1315,7 @@ static void trace_write_pushbuffer(struct channel_gk20a *c, struct gpfifo *g)
        u64 offset;
        struct dma_buf *dmabuf = NULL;
 
-       if (nvhost_debug_trace_cmdbuf) {
+       if (gk20a_debug_trace_cmdbuf) {
                u64 gpu_va = (u64)g->entry0 |
                        (u64)((u64)pbdma_gp_entry1_get_hi_v(g->entry1) << 32);
                int err;

diff --git a/drivers/video/tegra/host/gk20a/debug_gk20a.c b/drivers/video/tegra/host/gk20a/debug_gk20a.c
index 81094aa13d4256a5244f439d63ac33230b6374e5..da02376e7eab1398b423015f904ed2684a49253c 100644 (file)
--- a/drivers/video/tegra/host/gk20a/debug_gk20a.c
+++ b/drivers/video/tegra/host/gk20a/debug_gk20a.c
@@ -266,9 +266,12 @@ void gk20a_debug_init(struct platform_device *pdev)
 
        platform->debugfs = debugfs_create_dir(pdev->name, NULL);
 
-#if defined(NVHOST_DEBUG)
        debugfs_create_file("status", S_IRUGO, platform->debugfs,
                        pdev, &gk20a_debug_fops);
+       debugfs_create_u32("trace_cmdbuf", S_IRUGO|S_IWUSR, platform->debugfs,
+                       &gk20a_debug_trace_cmdbuf);
+
+#if defined(GK20A_DEBUG)
        debugfs_create_u32("dbg_mask", S_IRUGO|S_IWUSR, platform->debugfs,
                        &gk20a_dbg_mask);
        debugfs_create_u32("dbg_ftrace", S_IRUGO|S_IWUSR, platform->debugfs,

diff --git a/drivers/video/tegra/host/gk20a/debug_gk20a.h b/drivers/video/tegra/host/gk20a/debug_gk20a.h
index db85badd103c1f00c0abc3821e670d97bf5b90ef..cd2e09c31f915cd9c35155d322fbddb8b0d5b52e 100644 (file)
--- a/drivers/video/tegra/host/gk20a/debug_gk20a.h
+++ b/drivers/video/tegra/host/gk20a/debug_gk20a.h
@@ -17,6 +17,8 @@
 #ifndef _DEBUG_GK20A_H_
 #define _DEBUG_GK20A_H_
 
+extern unsigned int gk20a_debug_trace_cmdbuf;
+
 void gk20a_debug_dump(struct platform_device *pdev);
 void gk20a_debug_init(struct platform_device *pdev);