Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/lima: Drop resv argument from lima_bo_create_struct

It was only used for prime import, which is now handled by
drm_prime.c.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Qiang Yu <yuq825@gmail.com>
Cc: lima@lists.freedesktop.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190614203615.12639-44-daniel.vetter@ffwll.ch

+6 -11
+1 -1
drivers/gpu/drm/lima/lima_gem.c
··· 24 24 struct lima_bo *bo; 25 25 struct lima_device *ldev = to_lima_dev(dev); 26 26 27 - bo = lima_bo_create(ldev, size, flags, NULL, NULL); 27 + bo = lima_bo_create(ldev, size, flags, NULL); 28 28 if (IS_ERR(bo)) 29 29 return PTR_ERR(bo); 30 30
+1 -2
drivers/gpu/drm/lima/lima_gem_prime.c
··· 18 18 struct lima_device *ldev = to_lima_dev(dev); 19 19 struct lima_bo *bo; 20 20 21 - bo = lima_bo_create(ldev, attach->dmabuf->size, 0, sgt, 22 - attach->dmabuf->resv); 21 + bo = lima_bo_create(ldev, attach->dmabuf->size, 0, sgt); 23 22 if (IS_ERR(bo)) 24 23 return ERR_CAST(bo); 25 24
+3 -6
drivers/gpu/drm/lima/lima_object.c
··· 33 33 kfree(bo); 34 34 } 35 35 36 - static struct lima_bo *lima_bo_create_struct(struct lima_device *dev, u32 size, u32 flags, 37 - struct reservation_object *resv) 36 + static struct lima_bo *lima_bo_create_struct(struct lima_device *dev, u32 size, u32 flags) 38 37 { 39 38 struct lima_bo *bo; 40 39 int err; ··· 46 47 47 48 mutex_init(&bo->lock); 48 49 INIT_LIST_HEAD(&bo->va); 49 - bo->gem.resv = resv; 50 50 51 51 err = drm_gem_object_init(dev->ddev, &bo->gem, size); 52 52 if (err) { ··· 57 59 } 58 60 59 61 struct lima_bo *lima_bo_create(struct lima_device *dev, u32 size, 60 - u32 flags, struct sg_table *sgt, 61 - struct reservation_object *resv) 62 + u32 flags, struct sg_table *sgt) 62 63 { 63 64 int i, err; 64 65 size_t npages; 65 66 struct lima_bo *bo, *ret; 66 67 67 - bo = lima_bo_create_struct(dev, size, flags, resv); 68 + bo = lima_bo_create_struct(dev, size, flags); 68 69 if (IS_ERR(bo)) 69 70 return bo; 70 71
+1 -2
drivers/gpu/drm/lima/lima_object.h
··· 27 27 } 28 28 29 29 struct lima_bo *lima_bo_create(struct lima_device *dev, u32 size, 30 - u32 flags, struct sg_table *sgt, 31 - struct reservation_object *resv); 30 + u32 flags, struct sg_table *sgt); 32 31 void lima_bo_destroy(struct lima_bo *bo); 33 32 void *lima_bo_vmap(struct lima_bo *bo); 34 33 void lima_bo_vunmap(struct lima_bo *bo);