Commit d0eb6866 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915: Introduce gt_init_mmio 



We already call 2 gt-related init_mmio functions in driver_mmio_probe
and a 3rd one will be added by a follow-up patch, so pre-emptively
introduce a gt_init_mmio function to group them.

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200708003952.21831-6-daniele.ceraolospurio@intel.com
parent 792592e7

drivers/gpu/drm/i915/gt/intel_gt.c

+7 −0
Original line number Diff line number Diff line
@@ -44,6 +44,13 @@ void intel_gt_init_hw_early(struct intel_gt *gt, struct i915_ggtt *ggtt) 
	gt->ggtt = ggtt;

}



int intel_gt_init_mmio(struct intel_gt *gt)

{

	intel_uc_init_mmio(&gt->uc);



	return intel_engines_init_mmio(gt);

}



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

{

	struct intel_uncore *uncore = gt->uncore;

drivers/gpu/drm/i915/gt/intel_gt.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ static inline struct intel_gt *huc_to_gt(struct intel_huc *huc) 


void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915);

void intel_gt_init_hw_early(struct intel_gt *gt, struct i915_ggtt *ggtt);

int intel_gt_init_mmio(struct intel_gt *gt);

int __must_check intel_gt_init_hw(struct intel_gt *gt);

int intel_gt_init(struct intel_gt *gt);

void intel_gt_driver_register(struct intel_gt *gt);

drivers/gpu/drm/i915/i915_drv.c

+1 −3
Original line number Diff line number Diff line
@@ -531,9 +531,7 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv) 
	/* Try to make sure MCHBAR is enabled before poking at it */

	intel_setup_mchbar(dev_priv);



	intel_uc_init_mmio(&dev_priv->gt.uc);



	ret = intel_engines_init_mmio(&dev_priv->gt);

	ret = intel_gt_init_mmio(&dev_priv->gt);

	if (ret)

		goto err_uncore;

CRA Git | Maintained and supported by SUSTech CRA and CCSE