Commit abc584f9 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: Convert i915_gem_init_hw to intel_gt

More removal of implicit dev_priv from using old mmio accessors.

Actually the top level function remains but is split into a part which
writes to i915 and part which operates on intel_gt in order to initialize
the hardware.

GuC and engines are the only odd ones out remaining.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621070811.7006-15-tvrtko.ursulin@linux.intel.com
parent 28a1f789
...@@ -1231,28 +1231,32 @@ static void init_unused_rings(struct intel_gt *gt) ...@@ -1231,28 +1231,32 @@ static void init_unused_rings(struct intel_gt *gt)
} }
} }
int i915_gem_init_hw(struct drm_i915_private *dev_priv) static int init_hw(struct intel_gt *gt)
{ {
struct drm_i915_private *i915 = gt->i915;
struct intel_uncore *uncore = gt->uncore;
int ret; int ret;
dev_priv->gt.last_init_time = ktime_get(); gt->last_init_time = ktime_get();
/* Double layer security blanket, see i915_gem_init() */ /* Double layer security blanket, see i915_gem_init() */
intel_uncore_forcewake_get(&dev_priv->uncore, FORCEWAKE_ALL); intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
if (HAS_EDRAM(dev_priv) && INTEL_GEN(dev_priv) < 9) if (HAS_EDRAM(i915) && INTEL_GEN(i915) < 9)
I915_WRITE(HSW_IDICR, I915_READ(HSW_IDICR) | IDIHASHMSK(0xf)); intel_uncore_rmw(uncore, HSW_IDICR, 0, IDIHASHMSK(0xf));
if (IS_HASWELL(dev_priv)) if (IS_HASWELL(i915))
I915_WRITE(MI_PREDICATE_RESULT_2, IS_HSW_GT3(dev_priv) ? intel_uncore_write(uncore,
MI_PREDICATE_RESULT_2,
IS_HSW_GT3(i915) ?
LOWER_SLICE_ENABLED : LOWER_SLICE_DISABLED); LOWER_SLICE_ENABLED : LOWER_SLICE_DISABLED);
/* Apply the GT workarounds... */ /* Apply the GT workarounds... */
intel_gt_apply_workarounds(&dev_priv->gt); intel_gt_apply_workarounds(gt);
/* ...and determine whether they are sticking. */ /* ...and determine whether they are sticking. */
intel_gt_verify_workarounds(&dev_priv->gt, "init"); intel_gt_verify_workarounds(gt, "init");
intel_gt_init_swizzling(&dev_priv->gt); intel_gt_init_swizzling(gt);
/* /*
* At least 830 can leave some of the unused rings * At least 830 can leave some of the unused rings
...@@ -1260,48 +1264,58 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv) ...@@ -1260,48 +1264,58 @@ 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->gt); init_unused_rings(gt);
BUG_ON(!dev_priv->kernel_context);
ret = i915_terminally_wedged(dev_priv);
if (ret)
goto out;
ret = i915_ppgtt_init_hw(&dev_priv->gt); ret = i915_ppgtt_init_hw(gt);
if (ret) { if (ret) {
DRM_ERROR("Enabling PPGTT failed (%d)\n", ret); DRM_ERROR("Enabling PPGTT failed (%d)\n", ret);
goto out; goto out;
} }
ret = intel_wopcm_init_hw(&dev_priv->wopcm); ret = intel_wopcm_init_hw(&i915->wopcm);
if (ret) { if (ret) {
DRM_ERROR("Enabling WOPCM failed (%d)\n", ret); DRM_ERROR("Enabling WOPCM failed (%d)\n", ret);
goto out; goto out;
} }
/* We can't enable contexts until all firmware is loaded */ /* We can't enable contexts until all firmware is loaded */
ret = intel_uc_init_hw(dev_priv); ret = intel_uc_init_hw(i915);
if (ret) { if (ret) {
DRM_ERROR("Enabling uc failed (%d)\n", ret); DRM_ERROR("Enabling uc failed (%d)\n", ret);
goto out; goto out;
} }
intel_mocs_init_l3cc_table(&dev_priv->gt); intel_mocs_init_l3cc_table(gt);
/* Only when the HW is re-initialised, can we replay the requests */ /* Only when the HW is re-initialised, can we replay the requests */
ret = intel_engines_resume(dev_priv); ret = intel_engines_resume(i915);
if (ret) if (ret)
goto cleanup_uc; goto cleanup_uc;
intel_uncore_forcewake_put(&dev_priv->uncore, FORCEWAKE_ALL); intel_uncore_forcewake_put(uncore, FORCEWAKE_ALL);
intel_engines_set_scheduler_caps(dev_priv);
return 0; return 0;
cleanup_uc: cleanup_uc:
intel_uc_fini_hw(dev_priv); intel_uc_fini_hw(i915);
out: out:
intel_uncore_forcewake_put(&dev_priv->uncore, FORCEWAKE_ALL); intel_uncore_forcewake_put(uncore, FORCEWAKE_ALL);
return ret;
}
int i915_gem_init_hw(struct drm_i915_private *i915)
{
int ret;
BUG_ON(!i915->kernel_context);
ret = i915_terminally_wedged(i915);
if (ret)
return ret;
ret = init_hw(&i915->gt);
intel_engines_set_scheduler_caps(i915);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment