openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Refactor direct GPU reset from request waiters 

Combine the common code for the pair of waiters into a single function.

v2: Rename reset_request to wait_request_check_and_reset

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170223074422.4125-15-chris@chris-wilson.co.uk
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
This commit is contained in:
Chris Wilson 2017-02-23 07:44:20 +00:00
parent a49625f906
commit e07051142c
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1023,6 +1023,16 @@ bool __i915_spin_request(const struct drm_i915_gem_request *req,
return false;
}
static bool __i915_wait_request_check_and_reset(struct drm_i915_gem_request *request)
{
if (likely(!i915_reset_in_progress(&request->i915->gpu_error)))
return false;
__set_current_state(TASK_RUNNING);
i915_reset(request->i915);
return true;
}
/**
* i915_wait_request - wait until execution of request has finished
* @req: the request to wait upon
@ -1084,11 +1094,8 @@ long i915_wait_request(struct drm_i915_gem_request *req,
break;
if (flags & I915_WAIT_LOCKED &&
i915_reset_in_progress(&req->i915->gpu_error)) {
__set_current_state(TASK_RUNNING);
i915_reset(req->i915);
__i915_wait_request_check_and_reset(req))
continue;
}
if (signal_pending_state(state, current)) {
timeout = -ERESTARTSYS;
@ -1158,11 +1165,8 @@ long i915_wait_request(struct drm_i915_gem_request *req,
* itself, or indirectly by recovering the GPU).
*/
if (flags & I915_WAIT_LOCKED &&
i915_reset_in_progress(&req->i915->gpu_error)) {
__set_current_state(TASK_RUNNING);
i915_reset(req->i915);
__i915_wait_request_check_and_reset(req))
continue;
}
/* Only spin if we know the GPU is processing this request */
if (i915_spin_request(req, state, 2))