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

Commit d5abdfda authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Move init_unused_rings to gem_init_hw 



We need to do that every time we resume the rings, not just at load.
I've overlooked this in my untangling of the ring init code.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarDave Gordon <david.s.gordon@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e7778be1

drivers/gpu/drm/i915/i915_gem.c

+8 −8
Original line number Diff line number Diff line
@@ -4709,14 +4709,6 @@ int i915_gem_init_rings(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	int ret;



	/*

	 * At least 830 can leave some of the unused rings

	 * "active" (ie. head != tail) after resume which

	 * will prevent c3 entry. Makes sure all unused rings

	 * are totally idle.

	 */

	init_unused_rings(dev);



	ret = intel_init_render_ring_buffer(dev);

	if (ret)

		return ret;
@@ -4796,6 +4788,14 @@ i915_gem_init_hw(struct drm_device *dev) 


	i915_gem_init_swizzling(dev);



	/*

	 * At least 830 can leave some of the unused rings

	 * "active" (ie. head != tail) after resume which

	 * will prevent c3 entry. Makes sure all unused rings

	 * are totally idle.

	 */

	init_unused_rings(dev);



	for_each_ring(ring, dev_priv, i) {

		ret = ring->init_hw(ring);

		if (ret)