drm/i915/guc: Move Guc early init into own function

mwajdecz · jlahtine-intel · commit 3af7a9c6446b · 2017-10-04T19:45:52.000+03:00
We don't want to make aggregate uc functions to be too detailed. This will also make future patch easier. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Sagar Arun Kamble <sagar.a.kamble@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20171004153327.32608-7-michal.wajdeczko@intel.com
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
@@ -88,17 +88,20 @@ static void gen8_guc_raise_irq(struct intel_guc *guc)
 	I915_WRITE(GUC_SEND_INTERRUPT, GUC_SEND_TRIGGER);
 }
 
-void intel_uc_init_early(struct drm_i915_private *dev_priv)
+static void guc_init_early(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
-
 	intel_guc_ct_init_early(&guc->ct);
 
 	mutex_init(&guc->send_mutex);
 	guc->send = intel_guc_send_nop;
 	guc->notify = gen8_guc_raise_irq;
 }
 
+void intel_uc_init_early(struct drm_i915_private *dev_priv)
+{
+	guc_init_early(&dev_priv->guc);
+}
+
 void intel_uc_init_fw(struct drm_i915_private *dev_priv)
 {
 	intel_uc_fw_fetch(dev_priv, &dev_priv->huc.fw);

Original file line number	Diff line number	Diff line change
`@@ -88,17 +88,20 @@ static void gen8_guc_raise_irq(struct intel_guc *guc)`
`88`	`88`	`I915_WRITE(GUC_SEND_INTERRUPT, GUC_SEND_TRIGGER);`
`89`	`89`	`}`
`90`	`90`
`91`		`-void intel_uc_init_early(struct drm_i915_private *dev_priv)`
	`91`	`+static void guc_init_early(struct intel_guc *guc)`
`92`	`92`	`{`
`93`		`- struct intel_guc *guc = &dev_priv->guc;`
`94`		`-`
`95`	`93`	`intel_guc_ct_init_early(&guc->ct);`
`96`	`94`
`97`	`95`	`mutex_init(&guc->send_mutex);`
`98`	`96`	`guc->send = intel_guc_send_nop;`
`99`	`97`	`guc->notify = gen8_guc_raise_irq;`
`100`	`98`	`}`
`101`	`99`
	`100`	`+void intel_uc_init_early(struct drm_i915_private *dev_priv)`
	`101`	`+{`
	`102`	`+ guc_init_early(&dev_priv->guc);`
	`103`	`+}`
	`104`	`+`
`102`	`105`	`void intel_uc_init_fw(struct drm_i915_private *dev_priv)`
`103`	`106`	`{`
`104`	`107`	`intel_uc_fw_fetch(dev_priv, &dev_priv->huc.fw);`