[42/59] drm/etnaviv: Drop resv argument from etnaviv_gem_new_impl
diff mbox series

Message ID 20190614203615.12639-43-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
Only user was the prime import, and drm_prime.c takes care of that
now.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Russell King <linux+etnaviv@armlinux.org.uk>
Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: etnaviv@lists.freedesktop.org
---
 drivers/gpu/drm/etnaviv/etnaviv_gem.c       | 14 +++++---------
 drivers/gpu/drm/etnaviv/etnaviv_gem.h       |  3 +--
 drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c |  1 -
 3 files changed, 6 insertions(+), 12 deletions(-)

Comments

Lucas Stach June 25, 2019, 4:10 p.m. UTC | #1
Am Freitag, den 14.06.2019, 22:35 +0200 schrieb Daniel Vetter:
> Only user was the prime import, and drm_prime.c takes care of that
> now.
> 
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > Cc: Lucas Stach <l.stach@pengutronix.de>
> > Cc: Russell King <linux+etnaviv@armlinux.org.uk>
> > Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
> Cc: etnaviv@lists.freedesktop.org

Reviewed-by: Lucas Stach <l.stach@pengutronix.de>

> ---
>  drivers/gpu/drm/etnaviv/etnaviv_gem.c       | 14 +++++---------
>  drivers/gpu/drm/etnaviv/etnaviv_gem.h       |  3 +--
>  drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c |  1 -
>  3 files changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> index e8778ebb72e6..17ca602db60a 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> @@ -565,8 +565,7 @@ void etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj)
>  }
>  
>  static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flags,
> > -	struct reservation_object *robj, const struct etnaviv_gem_ops *ops,
> > -	struct drm_gem_object **obj)
> > +	const struct etnaviv_gem_ops *ops, struct drm_gem_object **obj)
>  {
> >  	struct etnaviv_gem_object *etnaviv_obj;
> >  	unsigned sz = sizeof(*etnaviv_obj);
> @@ -594,8 +593,6 @@ static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flags,
>  
> >  	etnaviv_obj->flags = flags;
> >  	etnaviv_obj->ops = ops;
> > -	if (robj)
> > -		etnaviv_obj->base.resv = robj;
>  
> >  	mutex_init(&etnaviv_obj->lock);
> >  	INIT_LIST_HEAD(&etnaviv_obj->vram_list);
> @@ -614,7 +611,7 @@ int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file,
>  
> >  	size = PAGE_ALIGN(size);
>  
> > -	ret = etnaviv_gem_new_impl(dev, size, flags, NULL,
> > +	ret = etnaviv_gem_new_impl(dev, size, flags,
> >  				   &etnaviv_gem_shmem_ops, &obj);
> >  	if (ret)
> >  		goto fail;
> @@ -646,13 +643,12 @@ int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file,
>  }
>  
>  int etnaviv_gem_new_private(struct drm_device *dev, size_t size, u32 flags,
> > -	struct reservation_object *robj, const struct etnaviv_gem_ops *ops,
> > -	struct etnaviv_gem_object **res)
> > +	const struct etnaviv_gem_ops *ops, struct etnaviv_gem_object **res)
>  {
> >  	struct drm_gem_object *obj;
> >  	int ret;
>  
> > -	ret = etnaviv_gem_new_impl(dev, size, flags, robj, ops, &obj);
> > +	ret = etnaviv_gem_new_impl(dev, size, flags, ops, &obj);
> >  	if (ret)
> >  		return ret;
>  
> @@ -734,7 +730,7 @@ int etnaviv_gem_new_userptr(struct drm_device *dev, struct drm_file *file,
> >  	struct etnaviv_gem_object *etnaviv_obj;
> >  	int ret;
>  
> > -	ret = etnaviv_gem_new_private(dev, size, ETNA_BO_CACHED, NULL,
> > +	ret = etnaviv_gem_new_private(dev, size, ETNA_BO_CACHED,
> >  				      &etnaviv_gem_userptr_ops, &etnaviv_obj);
> >  	if (ret)
> >  		return ret;
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.h b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
> index 753c458497d0..fcd5d71b502f 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.h
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
> @@ -112,8 +112,7 @@ void etnaviv_submit_put(struct etnaviv_gem_submit * submit);
>  int etnaviv_gem_wait_bo(struct etnaviv_gpu *gpu, struct drm_gem_object *obj,
> >  	struct timespec *timeout);
>  int etnaviv_gem_new_private(struct drm_device *dev, size_t size, u32 flags,
> > -	struct reservation_object *robj, const struct etnaviv_gem_ops *ops,
> > -	struct etnaviv_gem_object **res);
> > +	const struct etnaviv_gem_ops *ops, struct etnaviv_gem_object **res);
>  void etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj);
>  struct page **etnaviv_gem_get_pages(struct etnaviv_gem_object *obj);
>  void etnaviv_gem_put_pages(struct etnaviv_gem_object *obj);
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
> index 00e8b6a817e3..a05292e8ed6f 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
> @@ -109,7 +109,6 @@ struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev,
> >  	int ret, npages;
>  
> >  	ret = etnaviv_gem_new_private(dev, size, ETNA_BO_WC,
> > -				      attach->dmabuf->resv,
> >  				      &etnaviv_gem_prime_ops, &etnaviv_obj);
> >  	if (ret < 0)
> >  		return ERR_PTR(ret);

Patch
diff mbox series

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index e8778ebb72e6..17ca602db60a 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -565,8 +565,7 @@  void etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj)
 }
 
 static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flags,
-	struct reservation_object *robj, const struct etnaviv_gem_ops *ops,
-	struct drm_gem_object **obj)
+	const struct etnaviv_gem_ops *ops, struct drm_gem_object **obj)
 {
 	struct etnaviv_gem_object *etnaviv_obj;
 	unsigned sz = sizeof(*etnaviv_obj);
@@ -594,8 +593,6 @@  static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flags,
 
 	etnaviv_obj->flags = flags;
 	etnaviv_obj->ops = ops;
-	if (robj)
-		etnaviv_obj->base.resv = robj;
 
 	mutex_init(&etnaviv_obj->lock);
 	INIT_LIST_HEAD(&etnaviv_obj->vram_list);
@@ -614,7 +611,7 @@  int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file,
 
 	size = PAGE_ALIGN(size);
 
-	ret = etnaviv_gem_new_impl(dev, size, flags, NULL,
+	ret = etnaviv_gem_new_impl(dev, size, flags,
 				   &etnaviv_gem_shmem_ops, &obj);
 	if (ret)
 		goto fail;
@@ -646,13 +643,12 @@  int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file,
 }
 
 int etnaviv_gem_new_private(struct drm_device *dev, size_t size, u32 flags,
-	struct reservation_object *robj, const struct etnaviv_gem_ops *ops,
-	struct etnaviv_gem_object **res)
+	const struct etnaviv_gem_ops *ops, struct etnaviv_gem_object **res)
 {
 	struct drm_gem_object *obj;
 	int ret;
 
-	ret = etnaviv_gem_new_impl(dev, size, flags, robj, ops, &obj);
+	ret = etnaviv_gem_new_impl(dev, size, flags, ops, &obj);
 	if (ret)
 		return ret;
 
@@ -734,7 +730,7 @@  int etnaviv_gem_new_userptr(struct drm_device *dev, struct drm_file *file,
 	struct etnaviv_gem_object *etnaviv_obj;
 	int ret;
 
-	ret = etnaviv_gem_new_private(dev, size, ETNA_BO_CACHED, NULL,
+	ret = etnaviv_gem_new_private(dev, size, ETNA_BO_CACHED,
 				      &etnaviv_gem_userptr_ops, &etnaviv_obj);
 	if (ret)
 		return ret;
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.h b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
index 753c458497d0..fcd5d71b502f 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
@@ -112,8 +112,7 @@  void etnaviv_submit_put(struct etnaviv_gem_submit * submit);
 int etnaviv_gem_wait_bo(struct etnaviv_gpu *gpu, struct drm_gem_object *obj,
 	struct timespec *timeout);
 int etnaviv_gem_new_private(struct drm_device *dev, size_t size, u32 flags,
-	struct reservation_object *robj, const struct etnaviv_gem_ops *ops,
-	struct etnaviv_gem_object **res);
+	const struct etnaviv_gem_ops *ops, struct etnaviv_gem_object **res);
 void etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj);
 struct page **etnaviv_gem_get_pages(struct etnaviv_gem_object *obj);
 void etnaviv_gem_put_pages(struct etnaviv_gem_object *obj);
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
index 00e8b6a817e3..a05292e8ed6f 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
@@ -109,7 +109,6 @@  struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev,
 	int ret, npages;
 
 	ret = etnaviv_gem_new_private(dev, size, ETNA_BO_WC,
-				      attach->dmabuf->resv,
 				      &etnaviv_gem_prime_ops, &etnaviv_obj);
 	if (ret < 0)
 		return ERR_PTR(ret);