drm/i915: If interrupted while setting object domains, still emit the flush.

Otherwise, we would leave the objects in an inconsistent state, such as
write_domain == 0 but on the flushing list.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 9fd28ebe0aa3739a489c41d4a26772a8d53b1a13..3fe108b7e2fae7303c9b268188290655758f9254 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1880,8 +1880,20 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
                ret = i915_gem_object_set_domain(obj,
                                                 obj->pending_read_domains,
                                                 obj->pending_write_domain);
-               if (ret)
+               if (ret) {
+                       /* As we've partially updated domains on our buffers,
+                        * we have to emit the flush we've accumulated
+                        * before exiting, or we'll have broken the
+                        * active/flushing/inactive invariants.
+                        *
+                        * We'll potentially have some things marked as
+                        * being in write domains that they actually aren't,
+                        * but that should be merely a minor performance loss.
+                        */
+                       flush_domains = i915_gem_dev_set_domain(dev);
+                       (void)i915_add_request(dev, flush_domains);
                        goto err;
+               }
        }
 
        i915_verify_inactive(dev, __FILE__, __LINE__);