diff options
| author | Jacob Chen <jacob2.chen@rock-chips.com> | 2016-10-11 15:41:30 +0800 |
|---|---|---|
| committer | Jacob Chen <jacob2.chen@rock-chips.com> | 2016-10-11 15:41:30 +0800 |
| commit | cde3c3fdf278bbf3edc895667a65c0cc16daee0c (patch) | |
| tree | 32ae79e06d11d677cee0318e2ef5b990d0cbe88e /drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c | |
| parent | f27d1ca8e35893191bb344bb461d9f5f20be5ae7 (diff) | |
MALI: rockchip: upgrade midgard DDK to r9p0-05rel0release-20161011
Change-Id: Ie46489734268edac2db7508ed6976fc8b72c2f06
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Diffstat (limited to 'drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c')
| -rw-r--r-- | drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c index a98355e33d07..42d1d832c0a3 100644 --- a/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c @@ -1,6 +1,6 @@ /* * - * (C) COPYRIGHT 2013-2016 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2013-2015 ARM Limited. All rights reserved. * * This program is free software and is provided to you under the terms of the * GNU General Public License version 2 as published by the Free Software @@ -125,8 +125,6 @@ static int debug_mem_show(struct seq_file *m, void *v) page = pfn_to_page(PFN_DOWN(map->alloc->pages[data->offset])); mapping = vmap(&page, 1, VM_MAP, prot); - if (!mapping) - goto out; for (i = 0; i < PAGE_SIZE; i += 4*sizeof(*mapping)) { seq_printf(m, "%016llx:", i + ((map->start_pfn + @@ -162,15 +160,11 @@ static int debug_mem_open(struct inode *i, struct file *file) int ret; ret = seq_open(file, &ops); + if (ret) return ret; mem_data = kmalloc(sizeof(*mem_data), GFP_KERNEL); - if (!mem_data) { - ret = -ENOMEM; - goto out; - } - mem_data->kctx = kctx; INIT_LIST_HEAD(&mem_data->mapping_list); @@ -190,11 +184,6 @@ static int debug_mem_open(struct inode *i, struct file *file) continue; mapping = kmalloc(sizeof(*mapping), GFP_KERNEL); - if (!mapping) { - ret = -ENOMEM; - kbase_gpu_vm_unlock(kctx); - goto out; - } mapping->alloc = kbase_mem_phy_alloc_get(reg->gpu_alloc); mapping->start_pfn = reg->start_pfn; @@ -208,23 +197,6 @@ static int debug_mem_open(struct inode *i, struct file *file) ((struct seq_file *)file->private_data)->private = mem_data; return 0; - -out: - if (mem_data) { - while (!list_empty(&mem_data->mapping_list)) { - struct debug_mem_mapping *mapping; - - mapping = list_first_entry(&mem_data->mapping_list, - struct debug_mem_mapping, node); - kbase_mem_phy_alloc_put(mapping->alloc); - list_del(&mapping->node); - kfree(mapping); - } - fput(kctx_file); - kfree(mem_data); - } - seq_release(i, file); - return ret; } static int debug_mem_release(struct inode *inode, struct file *file) |