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>
This commit is contained in:
John Harrison 2015-05-29 17:43:35 +01:00 committed by Daniel Vetter
parent 5b4a60c276
commit 73cfa86512

View File

@ -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;