From d608aa53ee338922cbd47ec144cd6efb36fd0295 Mon Sep 17 00:00:00 2001 From: Arto Merilainen Date: Thu, 3 Jul 2014 12:07:30 +0300 Subject: 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 Reviewed-on: http://git-master/r/434038 Reviewed-by: Deepak Nibade Reviewed-by: Shridhar Rasal Reviewed-by: Bharat Nihalani --- drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c') 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) memset(q, 0, sizeof(struct priv_cmd_queue)); } -int gk20a_find_from_priv_cmdbuf(struct channel_gk20a *c, - u64 gpu_va, u32 **cpu_va) -{ - struct priv_cmd_queue *q = &c->priv_cmd_q; - int ret; - - if (gpu_va >= q->base_gpuva && gpu_va < (q->base_gpuva + q->size)) { - *cpu_va = gpu_va - q->base_gpuva + q->mem.base_cpuva; - ret = 0; - } else - ret = -EINVAL; - - return ret; -} - /* allocate a cmd buffer with given size. size is number of u32 entries */ int gk20a_channel_alloc_priv_cmdbuf(struct channel_gk20a *c, u32 orig_size, struct priv_cmd_entry **entry) -- cgit v1.2.2