Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 105f1a65 authored by Chris Wilson's avatar Chris Wilson Committed by Jani Nikula
Browse files

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



The conflict resolution of v4.8-rc8 backmerge to drm-next pulled back in
a few lines of dead code due to the code movement around
i915_gem_reset(), fix that up.

Fixes: ca09fb9f ("Merge tag 'v4.8-rc8' into drm-next")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161010125017.23911-1-chris@chris-wilson.co.uk
parent 449f6615

drivers/gpu/drm/i915/i915_gem.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -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)

	list_for_each_entry_continue(request, &engine->request_list, link)

		if (request->ctx == incomplete_ctx)

		if (request->ctx == incomplete_ctx)

			reset_request(request);

			reset_request(request);



	engine->i915->gt.active_engines &= ~intel_engine_flag(engine);

}

}





void i915_gem_reset(struct drm_i915_private *dev_priv)

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)

	for_each_engine(engine, dev_priv)

		i915_gem_reset_engine(engine);

		i915_gem_reset_engine(engine);

	mod_delayed_work(dev_priv->wq, &dev_priv->gt.idle_work, 0);





	i915_gem_restore_fences(&dev_priv->drm);

	i915_gem_restore_fences(&dev_priv->drm);