Re: [PATCH 17/19] drm/radeon: use rcu waits in some ioctls

From: "Michel Dänzer" <michel@daenzer.net>
To: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 17/19] drm/radeon: use rcu waits in some ioctls
Date: Fri, 01 Aug 2014 17:27:09 +0900	[thread overview]
Message-ID: <53DB4F5D.8000101@daenzer.net> (raw)
In-Reply-To: <20140731153432.15061.49403.stgit@patser>

On 01.08.2014 00:34, Maarten Lankhorst wrote:
> 
> @@ -357,14 +360,20 @@ 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;
> +	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, NULL, 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;
> +
>  	/* callback hw specific functions if any */
>  	if (rdev->asic->ioctl_wait_idle)
>  		robj->rdev->asic->ioctl_wait_idle(rdev, robj);

Heads up, this conflicts with
http://lists.freedesktop.org/archives/dri-devel/2014-August/065255.html
which passes a non-NULL second argument to radeon_bo_wait() to get the
BO's current domain.

-- 
Earthling Michel Dänzer            |                  http://www.amd.com
Libre software enthusiast          |                Mesa and X developer