p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/i915: Move the special case wait-request handling to its one caller 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470293567-10811-19-git-send-email-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2016-08-04 07:52:38 +01:00
parent 0d9bdd886f
commit 7da844c5c6
3 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpu/drm/i915/i915_gem_request.c
View File

@ -731,28 +731,3 @@ int __i915_wait_request(struct drm_i915_gem_request *req,
return ret;
}
/**
* Waits for a request to be signaled, and cleans up the
* request and object lists appropriately for that event.
*/
int i915_wait_request(struct drm_i915_gem_request *req)
{
int ret;
lockdep_assert_held(&req->i915->drm.struct_mutex);
GEM_BUG_ON(list_empty(&req->link));
ret = __i915_wait_request(req,
req->i915->mm.interruptible,
NULL,
NULL);
if (ret)
return ret;
/* If the GPU hung, we want to keep the requests to find the guilty. */
if (!i915_reset_in_progress(&req->i915->gpu_error))
i915_gem_request_retire_upto(req);
return 0;
}

4
drivers/gpu/drm/i915/i915_gem_request.h
View File

@ -220,10 +220,6 @@ int __i915_wait_request(struct drm_i915_gem_request *req,
struct intel_rps_client *rps)
__attribute__((nonnull(1)));
int __must_check
i915_wait_request(struct drm_i915_gem_request *req)
__attribute__((nonnull));
static inline u32 intel_engine_get_seqno(struct intel_engine_cs *engine);
/**

18
drivers/gpu/drm/i915/intel_ringbuffer.c
View File

@ -2269,6 +2269,7 @@ static int wait_for_space(struct drm_i915_gem_request *req, int bytes)
{
struct intel_ring *ring = req->ring;
struct drm_i915_gem_request *target;
int ret;
intel_ring_update_space(ring);
if (ring->space >= bytes)
@ -2298,7 +2299,18 @@ static int wait_for_space(struct drm_i915_gem_request *req, int bytes)
if (WARN_ON(&target->ring_link == &ring->request_list))
return -ENOSPC;
return i915_wait_request(target);
ret = __i915_wait_request(target, true, NULL, NULL);
if (ret)
return ret;
if (i915_reset_in_progress(&target->i915->gpu_error))
return -EAGAIN;
i915_gem_request_retire_upto(target);
intel_ring_update_space(ring);
GEM_BUG_ON(ring->space < bytes);
return 0;
}
int intel_ring_begin(struct drm_i915_gem_request *req, int num_dwords)
@ -2336,10 +2348,6 @@ int intel_ring_begin(struct drm_i915_gem_request *req, int num_dwords)
int ret = wait_for_space(req, wait_bytes);
if (unlikely(ret))
return ret;
intel_ring_update_space(ring);
if (unlikely(ring->space < wait_bytes))
return -EAGAIN;
}
if (unlikely(need_wrap)) {