Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fbbd27e authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarEric Anholt <eric@anholt.net>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Signed-off-by: default avatarDaniel 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
parent 97530410

drivers/gpu/drm/lima/lima_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ int lima_gem_create_handle(struct drm_device *dev, struct drm_file *file, 
	struct lima_bo *bo;

	struct lima_device *ldev = to_lima_dev(dev);



	bo = lima_bo_create(ldev, size, flags, NULL, NULL);

	bo = lima_bo_create(ldev, size, flags, NULL);

	if (IS_ERR(bo))

		return PTR_ERR(bo);

drivers/gpu/drm/lima/lima_gem_prime.c

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ struct drm_gem_object *lima_gem_prime_import_sg_table( 
	struct lima_device *ldev = to_lima_dev(dev);

	struct lima_bo *bo;



	bo = lima_bo_create(ldev, attach->dmabuf->size, 0, sgt,

			    attach->dmabuf->resv);

	bo = lima_bo_create(ldev, attach->dmabuf->size, 0, sgt);

	if (IS_ERR(bo))

		return ERR_CAST(bo);

drivers/gpu/drm/lima/lima_object.c

+3 −6
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ void lima_bo_destroy(struct lima_bo *bo) 
	kfree(bo);

}



static struct lima_bo *lima_bo_create_struct(struct lima_device *dev, u32 size, u32 flags,

					     struct reservation_object *resv)

static struct lima_bo *lima_bo_create_struct(struct lima_device *dev, u32 size, u32 flags)

{

	struct lima_bo *bo;

	int err;
@@ -47,7 +46,6 @@ static struct lima_bo *lima_bo_create_struct(struct lima_device *dev, u32 size, 


	mutex_init(&bo->lock);

	INIT_LIST_HEAD(&bo->va);

	bo->gem.resv = resv;



	err = drm_gem_object_init(dev->ddev, &bo->gem, size);

	if (err) {
@@ -59,14 +57,13 @@ static struct lima_bo *lima_bo_create_struct(struct lima_device *dev, u32 size, 
}



struct lima_bo *lima_bo_create(struct lima_device *dev, u32 size,

			       u32 flags, struct sg_table *sgt,

			       struct reservation_object *resv)

			       u32 flags, struct sg_table *sgt)

{

	int i, err;

	size_t npages;

	struct lima_bo *bo, *ret;



	bo = lima_bo_create_struct(dev, size, flags, resv);

	bo = lima_bo_create_struct(dev, size, flags);

	if (IS_ERR(bo))

		return bo;

drivers/gpu/drm/lima/lima_object.h

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ to_lima_bo(struct drm_gem_object *obj) 
}



struct lima_bo *lima_bo_create(struct lima_device *dev, u32 size,

			       u32 flags, struct sg_table *sgt,

			       struct reservation_object *resv);

			       u32 flags, struct sg_table *sgt);

void lima_bo_destroy(struct lima_bo *bo);

void *lima_bo_vmap(struct lima_bo *bo);

void lima_bo_vunmap(struct lima_bo *bo);