On Mon, 10 Oct 2016, Chris Wilson <ch...@chris-wilson.co.uk> wrote:
> Merging from drm-next pulled back in a few lines of dead code due to the
> code movement around i915_gem_reset(), fix that up.
Actually the problem was introduced in
commit ca09fb9f60b5f3ab2d57e761aaeea89a5147d784
Merge: 9f4ef05bcdcf 08895a8b6b06
Author: Dave Airlie <airl...@redhat.com>
Date: Wed Sep 28 12:08:49 2016 +1000
Merge tag 'v4.8-rc8' into drm-next
and it's present in drm-next, and the conflict wasn't silent.
If this is the right fix (Daniel ack?) I'll queue it with other drm-next
fixes that I have.
BR,
Jani.
>
> Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
> Cc: Jani Nikula <jani.nik...@intel.com>
> Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
> ---
> drivers/gpu/drm/i915/i915_gem.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 981a106901ae..1418c1c522cb 100644
> --- 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);
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
