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

Commit a03aac44 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Joonas Lahtinen
Browse files

drm/i915/guc: Move notification code into virtual function 



Prepare for alternate GuC notification mechanism.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
[Joonas: Added newlines]
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent eb8bc8dc

drivers/gpu/drm/i915/intel_uc.c

+9 −1
Original line number Diff line number Diff line
@@ -94,12 +94,20 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv) 
		i915.enable_guc_submission = HAS_GUC_SCHED(dev_priv);

}



static void guc_write_irq_trigger(struct intel_guc *guc)

{

	struct drm_i915_private *dev_priv = guc_to_i915(guc);



	I915_WRITE(GUC_SEND_INTERRUPT, GUC_SEND_TRIGGER);

}



void intel_uc_init_early(struct drm_i915_private *dev_priv)

{

	struct intel_guc *guc = &dev_priv->guc;



	mutex_init(&guc->send_mutex);

	guc->send = intel_guc_send_nop;

	guc->notify = guc_write_irq_trigger;

}



static void fetch_uc_fw(struct drm_i915_private *dev_priv,
@@ -413,7 +421,7 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len) 


	POSTING_READ(SOFT_SCRATCH(i - 1));



	I915_WRITE(GUC_SEND_INTERRUPT, GUC_SEND_TRIGGER);

	intel_guc_notify(guc);



	/*

	 * No GuC command should ever take longer than 10ms.

drivers/gpu/drm/i915/intel_uc.h

+9 −0
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ struct intel_guc { 


	/* GuC's FW specific send function */

	int (*send)(struct intel_guc *guc, const u32 *data, u32 len);



	/* GuC's FW specific notify function */

	void (*notify)(struct intel_guc *guc);

};



struct intel_huc {
@@ -229,11 +232,17 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv); 
int intel_guc_sample_forcewake(struct intel_guc *guc);

int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len);

int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len);



static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len)

{

	return guc->send(guc, action, len);

}



static inline void intel_guc_notify(struct intel_guc *guc)

{

	guc->notify(guc);

}



/* intel_guc_loader.c */

int intel_guc_select_fw(struct intel_guc *guc);

int intel_guc_init_hw(struct intel_guc *guc);