diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-01-18 09:32:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-01-18 09:32:15 +1000 |
| commit | 4a6cc7a44e98a0460bd094b68c75f0705fdc450a (patch) | |
| tree | b8c86a1e0342b1166ab52c4d79e404eede57abec /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | 8563188e37b000979ab66521f4337df9a3453223 (diff) | |
| parent | a8750ddca918032d6349adbf9a4b6555e7db20da (diff) | |
| download | linux-4a6cc7a44e98a0460bd094b68c75f0705fdc450a.tar.gz linux-4a6cc7a44e98a0460bd094b68c75f0705fdc450a.tar.bz2 linux-4a6cc7a44e98a0460bd094b68c75f0705fdc450a.zip | |
BackMerge tag 'v4.15-rc8' into drm-next
Linux 4.15-rc8
Daniel requested this for so the intel CI won't fall over on drm-next
so often.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 739c33b07c59..7ece2f061b9e 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1002,6 +1002,9 @@ static void execlists_schedule(struct drm_i915_gem_request *request, int prio) GEM_BUG_ON(prio == I915_PRIORITY_INVALID); + if (i915_gem_request_completed(request)) + return; + if (prio <= READ_ONCE(request->priotree.priority)) return; |