Merge tag 'drm-next-2019-12-06' of git://anongit.freedesktop.org/drm/drm

[platform/kernel/linux-rpi.git] / drivers / gpu / drm / i915 / gem / i915_gem_context.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index 4237a28..337ba17 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -1687,7 +1687,7 @@ replace:
                i915_gem_context_set_user_engines(ctx);
        else
                i915_gem_context_clear_user_engines(ctx);
-       rcu_swap_protected(ctx->engines, set.engines, 1);
+       set.engines = rcu_replace_pointer(ctx->engines, set.engines, 1);
        mutex_unlock(&ctx->engines_mutex);
 
        call_rcu(&set.engines->rcu, free_engines_rcu);