[Intel-gfx] [PATCH v4 27/61] drm/i915: Take obj lock around set_domain ioctl

[Maarten Lankhorst]

We need to lock the object to move it to the correct domain,
add the missing lock.

Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_domain.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c 
b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
index 9adced5a6843..0c0a8579f495 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
@@ -531,6 +531,10 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void 
*data,
                goto out;
        }
 
+       err = i915_gem_object_lock_interruptible(obj, NULL);
+       if (err)
+               goto out;
+
        /*
         * Flush and acquire obj->pages so that we are coherent through
         * direct access in memory with previous cached writes through
@@ -542,11 +546,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void 
*data,
         */
        err = i915_gem_object_pin_pages(obj);
        if (err)
-               goto out;
-
-       err = i915_gem_object_lock_interruptible(obj, NULL);
-       if (err)
-               goto out_unpin;
+               goto out_unlock;
 
        if (read_domains & I915_GEM_DOMAIN_WC)
                err = i915_gem_object_set_to_wc_domain(obj, write_domain);
@@ -558,13 +558,14 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void 
*data,
        /* And bump the LRU for this access */
        i915_gem_object_bump_inactive_ggtt(obj);
 
+       i915_gem_object_unpin_pages(obj);
+
+out_unlock:
        i915_gem_object_unlock(obj);
 
-       if (write_domain)
+       if (!err && write_domain)
                i915_gem_object_invalidate_frontbuffer(obj, ORIGIN_CPU);
 
-out_unpin:
-       i915_gem_object_unpin_pages(obj);
 out:
        i915_gem_object_put(obj);
        return err;
-- 
2.28.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx