Merge drm/drm-next into drm-intel-next-queued

[linux-block.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 30c229fcb4046ddd17a6aa3d9986cf67147d81e4..5c13809dc3c879bd217d7592b896d1b7b0b841e6 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -650,7 +650,7 @@ static void context_close(struct i915_gem_context *ctx)
         * context close.
         */
        if (!i915_gem_context_is_persistent(ctx) ||
-           !i915_modparams.enable_hangcheck)
+           !ctx->i915->params.enable_hangcheck)
                kill_context(ctx);
 
        i915_gem_context_put(ctx);
@@ -667,7 +667,7 @@ static int __context_set_persistence(struct i915_gem_context *ctx, bool state)
                 * reset] are allowed to survive past termination. We require
                 * hangcheck to ensure that the persistent requests are healthy.
                 */
-               if (!i915_modparams.enable_hangcheck)
+               if (!ctx->i915->params.enable_hangcheck)
                        return -EINVAL;
 
                i915_gem_context_set_persistence(ctx);