@@ -4395,14 +4395,25 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
i915_gem_retire_requests(dev);
obj_priv = to_intel_bo(obj);
- /* Don't count being on the flushing list against the object being
- * done. Otherwise, a buffer left on the flushing list but not getting
- * flushed (because nobody's flushing that domain) won't ever return
- * unbusy and get reused by libdrm's bo cache. The other expected
- * consumer of this interface, OpenGL's occlusion queries, also specs
- * that the objects get unbusy "eventually" without any interference.
- */
- args->busy = obj_priv->active && obj_priv->last_rendering_seqno != 0;
+
+ /* Count all active objects as busy, even if they are currently not used
+ * by the gpu. Users of this interface expect objects to eventually
+ * become non-busy without any further actions, therefore emit any
+ * necessary flushes here. */
+ args->busy = obj_priv->active;
+
+ /* Unconditionally flush objects, even when the gpu still uses this
+ * object. Userspace calling this function indicates that it wants to
+ * use this buffer rather sooner than later, so issuing the required
+ * flush earlier is beneficial. */
+ if (obj->write_domain) {
+ uint32_t seqno;
+
+ i915_gem_flush(dev, 0, obj->write_domain);
+ seqno = i915_add_request(dev, file_priv, obj->write_domain);
+ if (seqno == 0)
+ return -ENOMEM;
+ }
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);