[Intel-gfx] [PATCH] drm/i915: Simplify i915_gem_obj_is_pinned() test for set-tiling

[Daniel Vetter]

On Wed, Apr 15, 2015 at 04:39:59PM +0100, Chris Wilson wrote:
> Since the removal of the user pin_ioctl, the only means for pinning an
> object is either through binding to the scanout or during execbuf
> reservation. As the later prevents a call to set-tiling, we need only
> check if the obj is pinned into the display plane to see if we need
> reject the set-tiling ioctl.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
> index e1fa1d9aec6c..fd1b89a4d02d 100644
> --- a/drivers/gpu/drm/i915/i915_gem_tiling.c
> +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
> @@ -338,7 +338,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
>  	}
>  
>  	mutex_lock(&dev->struct_mutex);
> -	if (i915_gem_obj_is_pinned(obj) || obj->framebuffer_references) {
> +	if (obj->pin_display || obj->framebuffer_references) {
>  		ret = -EBUSY;
>  		goto err;
>  	}
> -- 
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch