diff options
author | John Harrison | 2015-05-29 18:43:39 +0200 |
---|---|---|
committer | Daniel Vetter | 2015-06-23 14:02:08 +0200 |
commit | dc4be6071a24f0d2da6af8ce16c19f276ac4d7a2 (patch) | |
tree | a3a4dfe745eb7e9c7b881292d74a9d4d8c50d757 /drivers/gpu/drm/i915/i915_gem_render_state.c | |
parent | drm/i915: Don't tag kernel batches as user batches (diff) | |
download | kernel-qcow2-linux-dc4be6071a24f0d2da6af8ce16c19f276ac4d7a2.tar.gz kernel-qcow2-linux-dc4be6071a24f0d2da6af8ce16c19f276ac4d7a2.tar.xz kernel-qcow2-linux-dc4be6071a24f0d2da6af8ce16c19f276ac4d7a2.zip |
drm/i915: Add explicit request management to i915_gem_init_hw()
Now that a single per ring loop is being done for all the different
intialisation steps in i915_gem_init_hw(), it is possible to add proper request
management as well. The last remaining issue is that the context enable call
eventually ends up within *_render_state_init() and this does its own private
_i915_add_request() call.
This patch adds explicit request creation and submission to the top level loop
and removes the add_request() from deep within the sub-functions.
v2: Updated for removal of batch_obj from add_request call in previous patch.
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_render_state.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_render_state.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c index a32a4b9492b6..a07b4ee89fc2 100644 --- a/drivers/gpu/drm/i915/i915_gem_render_state.c +++ b/drivers/gpu/drm/i915/i915_gem_render_state.c @@ -173,8 +173,6 @@ int i915_gem_render_state_init(struct intel_engine_cs *ring) i915_vma_move_to_active(i915_gem_obj_to_ggtt(so.obj), ring); - __i915_add_request(ring, NULL, NULL, true); - /* __i915_add_request moves object to inactive if it fails */ out: i915_gem_render_state_fini(&so); return ret; |