From: Chris Wilson Date: Wed, 15 Apr 2015 15:39:59 +0000 (+0100) Subject: drm/i915: Simplify i915_gem_obj_is_pinned() test for set-tiling X-Git-Tag: v4.13~4907^2~58^2~43 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1f30a61482df44ee75c4db73f7f3d70052b93e83;p=mirror_ubuntu-bionic-kernel.git drm/i915: Simplify i915_gem_obj_is_pinned() test for set-tiling 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 Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index 6377b22269ad..633bd1fcab69 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c @@ -336,7 +336,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; }