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

Commit cf6844b2 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Convert init_unused_rings to intel_gt 



More removal of implicit dev_priv from using old mmio accessors.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621070811.7006-9-tvrtko.ursulin@linux.intel.com
parent f88709bd

drivers/gpu/drm/i915/i915_gem.c

+23 −19
Original line number Original line Diff line number Diff line
@@ -1202,28 +1202,32 @@ void i915_gem_sanitize(struct drm_i915_private *i915) 
	intel_runtime_pm_put(&i915->runtime_pm, wakeref);

	intel_runtime_pm_put(&i915->runtime_pm, wakeref);

}

}





static void init_unused_ring(struct drm_i915_private *dev_priv, u32 base)

static void init_unused_ring(struct intel_gt *gt, u32 base)

{

{

	I915_WRITE(RING_CTL(base), 0);

	struct intel_uncore *uncore = gt->uncore;

	I915_WRITE(RING_HEAD(base), 0);



	I915_WRITE(RING_TAIL(base), 0);

	intel_uncore_write(uncore, RING_CTL(base), 0);

	I915_WRITE(RING_START(base), 0);

	intel_uncore_write(uncore, RING_HEAD(base), 0);

	intel_uncore_write(uncore, RING_TAIL(base), 0);

	intel_uncore_write(uncore, RING_START(base), 0);

}

}





static void init_unused_rings(struct drm_i915_private *dev_priv)

static void init_unused_rings(struct intel_gt *gt)

{

{

	if (IS_I830(dev_priv)) {

	struct drm_i915_private *i915 = gt->i915;

		init_unused_ring(dev_priv, PRB1_BASE);



		init_unused_ring(dev_priv, SRB0_BASE);

	if (IS_I830(i915)) {

		init_unused_ring(dev_priv, SRB1_BASE);

		init_unused_ring(gt, PRB1_BASE);

		init_unused_ring(dev_priv, SRB2_BASE);

		init_unused_ring(gt, SRB0_BASE);

		init_unused_ring(dev_priv, SRB3_BASE);

		init_unused_ring(gt, SRB1_BASE);

	} else if (IS_GEN(dev_priv, 2)) {

		init_unused_ring(gt, SRB2_BASE);

		init_unused_ring(dev_priv, SRB0_BASE);

		init_unused_ring(gt, SRB3_BASE);

		init_unused_ring(dev_priv, SRB1_BASE);

	} else if (IS_GEN(i915, 2)) {

	} else if (IS_GEN(dev_priv, 3)) {

		init_unused_ring(gt, SRB0_BASE);

		init_unused_ring(dev_priv, PRB1_BASE);

		init_unused_ring(gt, SRB1_BASE);

		init_unused_ring(dev_priv, PRB2_BASE);

	} else if (IS_GEN(i915, 3)) {

		init_unused_ring(gt, PRB1_BASE);

		init_unused_ring(gt, PRB2_BASE);

	}

	}

}

}
@@ -1256,7 +1260,7 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv) 
	 * will prevent c3 entry. Makes sure all unused rings

	 * will prevent c3 entry. Makes sure all unused rings

	 * are totally idle.

	 * are totally idle.

	 */

	 */

	init_unused_rings(dev_priv);

	init_unused_rings(&dev_priv->gt);





	BUG_ON(!dev_priv->kernel_context);

	BUG_ON(!dev_priv->kernel_context);

	ret = i915_terminally_wedged(dev_priv);

	ret = i915_terminally_wedged(dev_priv);