drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next

[cascardo/linux.git] / drivers / gpu / drm / i915 / i915_gem.c

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 981a106..1418c1c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2616,8 +2616,6 @@ static void i915_gem_reset_engine(struct intel_engine_cs *engine)
        list_for_each_entry_continue(request, &engine->request_list, link)
                if (request->ctx == incomplete_ctx)
                        reset_request(request);
-
-       engine->i915->gt.active_engines &= ~intel_engine_flag(engine);
 }
 
 void i915_gem_reset(struct drm_i915_private *dev_priv)
@@ -2628,7 +2626,6 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)
 
        for_each_engine(engine, dev_priv)
                i915_gem_reset_engine(engine);
-       mod_delayed_work(dev_priv->wq, &dev_priv->gt.idle_work, 0);
 
        i915_gem_restore_fences(&dev_priv->drm);