diff options
| author | Chris Wilson | 2013-08-27 00:50:54 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-09-04 17:34:54 +0200 |
| commit | 9a7e0c2a1bff84d20ef02a85898f9c8757d1441c (patch) | |
| tree | 26424838eb6dc9dceeeb44b4e84420cda1464930 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Do not add an interrupt for a context switch (diff) | |
| download | kernel-qcow2-linux-9a7e0c2a1bff84d20ef02a85898f9c8757d1441c.tar.gz kernel-qcow2-linux-9a7e0c2a1bff84d20ef02a85898f9c8757d1441c.tar.xz kernel-qcow2-linux-9a7e0c2a1bff84d20ef02a85898f9c8757d1441c.zip | |
drm/i915: Rearrange the comments in i915_add_request()
The comments were a little out-of-sequence with the code, forcing the
reader to jump around whilst reading. Whilst moving the comments around,
add one to explain the context reference.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 22be39feadc0..fdeecae058e1 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2062,8 +2062,6 @@ int __i915_add_request(struct intel_ring_buffer *ring, request->ring = ring; request->head = request_start; request->tail = request_ring_position; - request->ctx = ring->last_context; - request->batch_obj = obj; /* Whilst this request exists, batch_obj will be on the * active_list, and so will hold the active reference. Only when this @@ -2071,7 +2069,12 @@ int __i915_add_request(struct intel_ring_buffer *ring, * inactive_list and lose its active reference. Hence we do not need * to explicitly hold another reference here. */ + request->batch_obj = obj; + /* Hold a reference to the current context so that we can inspect + * it later in case a hangcheck error event fires. + */ + request->ctx = ring->last_context; if (request->ctx) i915_gem_context_reference(request->ctx); |