summaryrefslogtreecommitdiff
path: root/drivers/gpu/msm/kgsl_sharedmem.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/msm/kgsl_sharedmem.h')
-rw-r--r--drivers/gpu/msm/kgsl_sharedmem.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/msm/kgsl_sharedmem.h b/drivers/gpu/msm/kgsl_sharedmem.h
index 151217523759..5093ebd6e51a 100644
--- a/drivers/gpu/msm/kgsl_sharedmem.h
+++ b/drivers/gpu/msm/kgsl_sharedmem.h
@@ -267,11 +267,8 @@ static inline int kgsl_allocate_global(struct kgsl_device *device,
memdesc->priv = priv;
ret = kgsl_sharedmem_alloc_contig(device, memdesc, NULL, (size_t) size);
- if (!ret) {
- ret = kgsl_add_global_pt_entry(device, memdesc);
- if (ret)
- kgsl_sharedmem_free(memdesc);
- }
+ if (ret == 0)
+ kgsl_mmu_add_global(device, memdesc);
return ret;
}
@@ -280,14 +277,16 @@ static inline int kgsl_allocate_global(struct kgsl_device *device,
* kgsl_free_global() - Free a device wide GPU allocation and remove it from the
* global pagetable entry list
*
+ * @device: Pointer to the device
* @memdesc: Pointer to the GPU memory descriptor to free
*
* Remove the specific memory descriptor from the global pagetable entry list
* and free it
*/
-static inline void kgsl_free_global(struct kgsl_memdesc *memdesc)
+static inline void kgsl_free_global(struct kgsl_device *device,
+ struct kgsl_memdesc *memdesc)
{
- kgsl_remove_global_pt_entry(memdesc);
+ kgsl_mmu_remove_global(device, memdesc);
kgsl_sharedmem_free(memdesc);
}