Unverified Commit fa238ea1 authored by Rob Herring's avatar Rob Herring Committed by Maxime Ripard
Browse files

drm: etnaviv: Switch to use drm_gem_object reservation_object 



Now that the base struct drm_gem_object has a reservation_object, use it
and remove the private BO one.

Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Russell King <linux+etnaviv@armlinux.org.uk>
Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: etnaviv@lists.freedesktop.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarChristian Gmeiner <christian.gmeiner@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190202154158.10443-3-robh@kernel.org


Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parent 1ba62714

drivers/gpu/drm/etnaviv/etnaviv_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -473,7 +473,6 @@ static struct drm_driver etnaviv_drm_driver = { 
	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_export   = drm_gem_prime_export,

	.gem_prime_import   = drm_gem_prime_import,

	.gem_prime_res_obj  = etnaviv_gem_prime_res_obj,

	.gem_prime_pin      = etnaviv_gem_prime_pin,

	.gem_prime_unpin    = etnaviv_gem_prime_unpin,

	.gem_prime_get_sg_table = etnaviv_gem_prime_get_sg_table,

drivers/gpu/drm/etnaviv/etnaviv_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj); 
void etnaviv_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);

int etnaviv_gem_prime_mmap(struct drm_gem_object *obj,

			   struct vm_area_struct *vma);

struct reservation_object *etnaviv_gem_prime_res_obj(struct drm_gem_object *obj);

struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev,

	struct dma_buf_attachment *attach, struct sg_table *sg);

int etnaviv_gem_prime_pin(struct drm_gem_object *obj);

drivers/gpu/drm/etnaviv/etnaviv_gem.c

+5 −11
Original line number Diff line number Diff line
@@ -397,13 +397,13 @@ int etnaviv_gem_cpu_prep(struct drm_gem_object *obj, u32 op, 
	}



	if (op & ETNA_PREP_NOSYNC) {

		if (!reservation_object_test_signaled_rcu(etnaviv_obj->resv,

		if (!reservation_object_test_signaled_rcu(obj->resv,

							  write))

			return -EBUSY;

	} else {

		unsigned long remain = etnaviv_timeout_to_jiffies(timeout);



		ret = reservation_object_wait_timeout_rcu(etnaviv_obj->resv,

		ret = reservation_object_wait_timeout_rcu(obj->resv,

							  write, true, remain);

		if (ret <= 0)

			return ret == 0 ? -ETIMEDOUT : ret;
@@ -459,7 +459,7 @@ static void etnaviv_gem_describe_fence(struct dma_fence *fence, 
static void etnaviv_gem_describe(struct drm_gem_object *obj, struct seq_file *m)

{

	struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);

	struct reservation_object *robj = etnaviv_obj->resv;

	struct reservation_object *robj = obj->resv;

	struct reservation_object_list *fobj;

	struct dma_fence *fence;

	unsigned long off = drm_vma_node_start(&obj->vma_node);
@@ -549,8 +549,6 @@ void etnaviv_gem_free_object(struct drm_gem_object *obj) 


	drm_gem_free_mmap_offset(obj);

	etnaviv_obj->ops->release(etnaviv_obj);

	if (etnaviv_obj->resv == &etnaviv_obj->_resv)

		reservation_object_fini(&etnaviv_obj->_resv);

	drm_gem_object_release(obj);



	kfree(etnaviv_obj);
@@ -596,12 +594,8 @@ 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->resv = robj;

	} else {

		etnaviv_obj->resv = &etnaviv_obj->_resv;

		reservation_object_init(&etnaviv_obj->_resv);

	}

	if (robj)

		etnaviv_obj->base.resv = robj;



	mutex_init(&etnaviv_obj->lock);

	INIT_LIST_HEAD(&etnaviv_obj->vram_list);

drivers/gpu/drm/etnaviv/etnaviv_gem.h

+0 −4
Original line number Diff line number Diff line
@@ -47,10 +47,6 @@ struct etnaviv_gem_object { 
	struct sg_table *sgt;

	void *vaddr;



	/* normally (resv == &_resv) except for imported bo's */

	struct reservation_object *resv;

	struct reservation_object _resv;



	struct list_head vram_list;



	/* cache maintenance */

drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c

+0 −7
Original line number Diff line number Diff line
@@ -139,10 +139,3 @@ fail: 


	return ERR_PTR(ret);

}
 


struct reservation_object *etnaviv_gem_prime_res_obj(struct drm_gem_object *obj)

{

	struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);



	return etnaviv_obj->resv;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE