Commit 5b5554c5 authored by Chris Wilson's avatar Chris Wilson

drm/i915: Check for an invalid seqno before __i915_gem_request_started

__i915_gem_request_started() asserts that the seqno is valid, but
i915_spin_request() was not checking before querying whether the request
had started.
Reported-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Fixes: 754c9fd5 ("drm/i915: Protect the request->global_seqno with the engine->timeline lock")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170308142238.22994-1-chris@chris-wilson.co.ukReviewed-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parent f166244a
...@@ -348,6 +348,9 @@ static inline bool i915_spin_request(const struct drm_i915_gem_request *request, ...@@ -348,6 +348,9 @@ static inline bool i915_spin_request(const struct drm_i915_gem_request *request,
u32 seqno; u32 seqno;
seqno = i915_gem_request_global_seqno(request); seqno = i915_gem_request_global_seqno(request);
if (!seqno)
return 0;
return (__i915_gem_request_started(request, seqno) && return (__i915_gem_request_started(request, seqno) &&
__i915_spin_request(request, seqno, state, timeout_us)); __i915_spin_request(request, seqno, state, timeout_us));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment