drm/i915: Update i915_gpu_idle() to manage its own request

Added explicit request creation and submission to the GPU idle code path.

For: VIZ-5115
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Tomas Elf <tomas.elf@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 74c319350876ff57be0994b9c51a55fc6d28d903..1a3a65d022389bae429f6d3f3e2d83c76fe0ce94 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3305,11 +3305,23 @@ int i915_gpu_idle(struct drm_device *dev)
        /* Flush everything onto the inactive list. */
        for_each_ring(ring, dev_priv, i) {
                if (!i915.enable_execlists) {
-                       ret = i915_switch_context(ring, ring->default_context);
+                       struct drm_i915_gem_request *req;
+
+                       ret = i915_gem_request_alloc(ring, ring->default_context, &req);
                        if (ret)
                                return ret;
+
+                       ret = i915_switch_context(req->ring, ring->default_context);
+                       if (ret) {
+                               i915_gem_request_cancel(req);
+                               return ret;
+                       }
+
+                       i915_add_request_no_flush(req->ring);
                }
 
+               WARN_ON(ring->outstanding_lazy_request);
+
                ret = intel_ring_idle(ring);
                if (ret)
                        return ret;