diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-12-22 14:40:44 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-12-22 15:18:04 +0000 |
| commit | cfe6b30fc37cc8a6ac9241e450c91ad7a7d6874c (patch) | |
| tree | ff0ac2ba8a3891fbd8cfb2113a69efec50f070c6 /drivers/gpu/drm/i915/gt/intel_gt.c | |
| parent | e26b6d4341476f6944f57bb78fffcdf332c5948b (diff) | |
drm/i915/gt: Pull intel_gt_init_hw() into intel_gt_resume()
Since intel_gt_resume() is always immediately proceeded by init_hw, pull
the call into intel_gt_resume, where we have the rpm and fw already
held.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Andi Shyti <andi.shyti@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191222144046.1674865-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_gt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_gt.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index f29c44bf992f6..4a2d0eb056635 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -594,14 +594,9 @@ int intel_gt_init(struct intel_gt *gt) intel_uc_init(>->uc); - err = intel_gt_init_hw(gt); - if (err) - goto err_uc_init; - - /* Only when the HW is re-initialised, can we replay the requests */ err = intel_gt_resume(gt); if (err) - goto err_gt_init_hw; + goto err_uc_init; err = __engines_record_defaults(gt); if (err) @@ -618,7 +613,6 @@ int intel_gt_init(struct intel_gt *gt) goto out_fw; err_gt: __intel_gt_disable(gt); -err_gt_init_hw: intel_uc_fini_hw(>->uc); err_uc_init: intel_uc_fini(>->uc); |