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

Commit 39e7f6f8 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/radeon: use rcu waits in some ioctls 



Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
parent 59701f96

drivers/gpu/drm/radeon/radeon_gem.c

+16 −6
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj, 
{

	struct radeon_bo *robj;

	uint32_t domain;

	int r;

	long r;



	/* FIXME: reeimplement */

	robj = gem_to_radeon_bo(gobj);
@@ -110,9 +110,12 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj, 
	}

	if (domain == RADEON_GEM_DOMAIN_CPU) {

		/* Asking for cpu access wait for object idle */

		r = radeon_bo_wait(robj, NULL, false);

		if (r) {

			printk(KERN_ERR "Failed to wait for object !\n");

		r = reservation_object_wait_timeout_rcu(robj->tbo.resv, true, true, 30 * HZ);

		if (!r)

			r = -EBUSY;



		if (r < 0 && r != -EINTR) {

			printk(KERN_ERR "Failed to wait for object: %li\n", r);

			return r;

		}

	}
@@ -449,15 +452,22 @@ int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data, 
	struct drm_radeon_gem_wait_idle *args = data;

	struct drm_gem_object *gobj;

	struct radeon_bo *robj;

	int r;

	int r = 0;

	uint32_t cur_placement = 0;

	long ret;



	gobj = drm_gem_object_lookup(dev, filp, args->handle);

	if (gobj == NULL) {

		return -ENOENT;

	}

	robj = gem_to_radeon_bo(gobj);

	r = radeon_bo_wait(robj, &cur_placement, false);



	ret = reservation_object_wait_timeout_rcu(robj->tbo.resv, true, true, 30 * HZ);

	if (ret == 0)

		r = -EBUSY;

	else if (ret < 0)

		r = ret;



	/* Flush HDP cache via MMIO if necessary */

	if (rdev->asic->mmio_hdp_flush &&

	    radeon_mem_type_to_domain(cur_placement) == RADEON_GEM_DOMAIN_VRAM)