summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorJohn Harrison <John.C.Harrison@Intel.com>2015-05-29 17:43:39 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-06-23 14:02:08 +0200
commitdc4be6071a24f0d2da6af8ce16c19f276ac4d7a2 (patch)
treea3a4dfe745eb7e9c7b881292d74a9d4d8c50d757 /drivers/gpu/drm/i915/i915_drv.h
parenta3fbe05a611811ad8413130f63aaa79428b00377 (diff)
downloadlwn-dc4be6071a24f0d2da6af8ce16c19f276ac4d7a2.tar.gz
lwn-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_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 198e681639b7..75255392e1f4 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2169,7 +2169,8 @@ struct drm_i915_gem_request {
struct intel_context *ctx;
struct intel_ringbuffer *ringbuf;
- /** Batch buffer related to this request if any */
+ /** Batch buffer related to this request if any (used for
+ error state dump only) */
struct drm_i915_gem_object *batch_obj;
/** Time at which this request was emitted, in jiffies. */