[43/59] drm/lima: Drop resv argument from lima_bo_create_struct
diff mbox series

Message ID 20190614203615.12639-44-daniel.vetter@ffwll.ch
State New
Headers show
Series
  • prime doc polish and ... a few cleanups
Related show

Commit Message

Daniel Vetter June 14, 2019, 8:35 p.m. UTC
It was only used for prime import, which is now handled by
drm_prime.c.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Qiang Yu <yuq825@gmail.com>
Cc: lima@lists.freedesktop.org
---
 drivers/gpu/drm/lima/lima_gem.c       | 2 +-
 drivers/gpu/drm/lima/lima_gem_prime.c | 3 +--
 drivers/gpu/drm/lima/lima_object.c    | 9 +++------
 drivers/gpu/drm/lima/lima_object.h    | 3 +--
 4 files changed, 6 insertions(+), 11 deletions(-)

Comments

Qiang Yu June 15, 2019, 10:03 a.m. UTC | #1
Looks good for me, patch is:
Reviewed-by: Qiang Yu <yuq825@gmail.com>

Regards,
Qiang

On Sat, Jun 15, 2019 at 4:37 AM Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>
> It was only used for prime import, which is now handled by
> drm_prime.c.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Qiang Yu <yuq825@gmail.com>
> Cc: lima@lists.freedesktop.org
> ---
>  drivers/gpu/drm/lima/lima_gem.c       | 2 +-
>  drivers/gpu/drm/lima/lima_gem_prime.c | 3 +--
>  drivers/gpu/drm/lima/lima_object.c    | 9 +++------
>  drivers/gpu/drm/lima/lima_object.h    | 3 +--
>  4 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c
> index 477c0f766663..fd1a024703d2 100644
> --- a/drivers/gpu/drm/lima/lima_gem.c
> +++ b/drivers/gpu/drm/lima/lima_gem.c
> @@ -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);
>
> diff --git a/drivers/gpu/drm/lima/lima_gem_prime.c b/drivers/gpu/drm/lima/lima_gem_prime.c
> index 9c6d9f1dba55..e3eb251e0a12 100644
> --- a/drivers/gpu/drm/lima/lima_gem_prime.c
> +++ b/drivers/gpu/drm/lima/lima_gem_prime.c
> @@ -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);
>
> diff --git a/drivers/gpu/drm/lima/lima_object.c b/drivers/gpu/drm/lima/lima_object.c
> index 5c41f859a72f..87123b1d083c 100644
> --- a/drivers/gpu/drm/lima/lima_object.c
> +++ b/drivers/gpu/drm/lima/lima_object.c
> @@ -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;
>
> diff --git a/drivers/gpu/drm/lima/lima_object.h b/drivers/gpu/drm/lima/lima_object.h
> index 6738724afb7b..31ca2d8dc0a1 100644
> --- a/drivers/gpu/drm/lima/lima_object.h
> +++ b/drivers/gpu/drm/lima/lima_object.h
> @@ -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);
> --
> 2.20.1
>

Patch
diff mbox series

diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c
index 477c0f766663..fd1a024703d2 100644
--- a/drivers/gpu/drm/lima/lima_gem.c
+++ b/drivers/gpu/drm/lima/lima_gem.c
@@ -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);
 
diff --git a/drivers/gpu/drm/lima/lima_gem_prime.c b/drivers/gpu/drm/lima/lima_gem_prime.c
index 9c6d9f1dba55..e3eb251e0a12 100644
--- a/drivers/gpu/drm/lima/lima_gem_prime.c
+++ b/drivers/gpu/drm/lima/lima_gem_prime.c
@@ -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);
 
diff --git a/drivers/gpu/drm/lima/lima_object.c b/drivers/gpu/drm/lima/lima_object.c
index 5c41f859a72f..87123b1d083c 100644
--- a/drivers/gpu/drm/lima/lima_object.c
+++ b/drivers/gpu/drm/lima/lima_object.c
@@ -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;
 
diff --git a/drivers/gpu/drm/lima/lima_object.h b/drivers/gpu/drm/lima/lima_object.h
index 6738724afb7b..31ca2d8dc0a1 100644
--- a/drivers/gpu/drm/lima/lima_object.h
+++ b/drivers/gpu/drm/lima/lima_object.h
@@ -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);