diff options
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem_prime.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem_prime.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_gem_prime.c index 5d64e0671f7a..94ab705e9b8a 100644 --- a/drivers/gpu/drm/msm/msm_gem_prime.c +++ b/drivers/gpu/drm/msm/msm_gem_prime.c @@ -4,41 +4,39 @@ * Author: Rob Clark <robdclark@gmail.com> */ +#include <linux/dma-buf.h> + +#include <drm/drm_prime.h> + #include "msm_drv.h" #include "msm_gem.h" -#include <linux/dma-buf.h> - struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj) { struct msm_gem_object *msm_obj = to_msm_bo(obj); int npages = obj->size >> PAGE_SHIFT; if (WARN_ON(!msm_obj->pages)) /* should have already pinned! */ - return NULL; + return ERR_PTR(-ENOMEM); - return drm_prime_pages_to_sg(msm_obj->pages, npages); + return drm_prime_pages_to_sg(obj->dev, msm_obj->pages, npages); } -void *msm_gem_prime_vmap(struct drm_gem_object *obj) +int msm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map) { - return msm_gem_get_vaddr(obj); -} + void *vaddr; -void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) -{ - msm_gem_put_vaddr(obj); + vaddr = msm_gem_get_vaddr(obj); + if (IS_ERR(vaddr)) + return PTR_ERR(vaddr); + iosys_map_set_vaddr(map, vaddr); + + return 0; } -int msm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) +void msm_gem_prime_vunmap(struct drm_gem_object *obj, struct iosys_map *map) { - int ret; - - ret = drm_gem_mmap_obj(obj, obj->size, vma); - if (ret < 0) - return ret; - - return msm_gem_mmap_obj(vma->vm_private_data, vma); + msm_gem_put_vaddr(obj); } struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev, |