diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-04-09 18:24:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-04-09 18:24:58 +0200 |
| commit | ee1400dda31814d0a61c964ad87da6880edec0e2 (patch) | |
| tree | efa8774a97234cf93b22877a51a54f71f9e979cb /drivers/gpu/drm/i915/i915_gem_batch_pool.c | |
| parent | x86/entry/64: Drop idtentry's manual stack switch for user entries (diff) | |
| parent | Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-ee1400dda31814d0a61c964ad87da6880edec0e2.tar.xz linux-ee1400dda31814d0a61c964ad87da6880edec0e2.zip | |
Merge branch 'linus' into x86/pti to pick up upstream changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_batch_pool.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_batch_pool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_batch_pool.c b/drivers/gpu/drm/i915/i915_gem_batch_pool.c index c93005c2e0fb..d3cbe8432f48 100644 --- a/drivers/gpu/drm/i915/i915_gem_batch_pool.c +++ b/drivers/gpu/drm/i915/i915_gem_batch_pool.c @@ -119,7 +119,7 @@ i915_gem_batch_pool_get(struct i915_gem_batch_pool *pool, if (!reservation_object_test_signaled_rcu(resv, true)) break; - i915_gem_retire_requests(pool->engine->i915); + i915_retire_requests(pool->engine->i915); GEM_BUG_ON(i915_gem_object_is_active(obj)); /* |