drm/i915: Make intel_display_suspend atomic, try 2.

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_gem_render_state.c

diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c
index 6598f9bc67e559178a9300ad4c7be94396b31862..a0201fc94d256431b41aa5ca26dbef0fae565257 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_render_state.c
+++ b/drivers/gpu/drm/i915/i915_gem_render_state.c
@@ -164,14 +164,13 @@ int i915_gem_render_state_init(struct drm_i915_gem_request *req)
        if (so.rodata == NULL)
                return 0;
 
-       ret = req->ring->dispatch_execbuffer(req->ring,
-                                            so.ggtt_offset,
+       ret = req->ring->dispatch_execbuffer(req, so.ggtt_offset,
                                             so.rodata->batch_items * 4,
                                             I915_DISPATCH_SECURE);
        if (ret)
                goto out;
 
-       i915_vma_move_to_active(i915_gem_obj_to_ggtt(so.obj), req->ring);
+       i915_vma_move_to_active(i915_gem_obj_to_ggtt(so.obj), req);
 
 out:
        i915_gem_render_state_fini(&so);