summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
diff options
context:
space:
mode:
authorArto Merilainen <amerilainen@nvidia.com>2014-07-03 05:07:30 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:10:24 -0400
commitd608aa53ee338922cbd47ec144cd6efb36fd0295 (patch)
treeb713238e0541dec4f85d45ee68276b5e643b8421 /drivers/gpu/nvgpu/gk20a/channel_gk20a.c
parentf554ab30463438e5ce76ecf897a527ba5881fdbf (diff)
Revert "gpu: nvgpu: Dump offending push buffer fragment"
Channel and gpfifo allocations are entirely separated from each other, however, the code here assumes that active channel means that the channel also has a gpfifo. This reverts commit a24602f094380539788696d1b1567a4f4d914b17 which added gpfifo dump. Changing debug dumping to be safe requires refactoring the channel release code to use proper locking. Bug 1530226 Change-Id: I2fb02542a17dd56a0a9ce732b327e34b85ade8b9 Signed-off-by: Arto Merilainen <amerilainen@nvidia.com> Reviewed-on: http://git-master/r/434038 Reviewed-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-by: Shridhar Rasal <srasal@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index b4d9c785..78e52c62 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -933,21 +933,6 @@ static void channel_gk20a_free_priv_cmdbuf(struct channel_gk20a *c)
933 memset(q, 0, sizeof(struct priv_cmd_queue)); 933 memset(q, 0, sizeof(struct priv_cmd_queue));
934} 934}
935 935
936int gk20a_find_from_priv_cmdbuf(struct channel_gk20a *c,
937 u64 gpu_va, u32 **cpu_va)
938{
939 struct priv_cmd_queue *q = &c->priv_cmd_q;
940 int ret;
941
942 if (gpu_va >= q->base_gpuva && gpu_va < (q->base_gpuva + q->size)) {
943 *cpu_va = gpu_va - q->base_gpuva + q->mem.base_cpuva;
944 ret = 0;
945 } else
946 ret = -EINVAL;
947
948 return ret;
949}
950
951/* allocate a cmd buffer with given size. size is number of u32 entries */ 936/* allocate a cmd buffer with given size. size is number of u32 entries */
952int gk20a_channel_alloc_priv_cmdbuf(struct channel_gk20a *c, u32 orig_size, 937int gk20a_channel_alloc_priv_cmdbuf(struct channel_gk20a *c, u32 orig_size,
953 struct priv_cmd_entry **entry) 938 struct priv_cmd_entry **entry)