diff options
| author | Oscar Mateo | 2017-03-22 18:39:49 +0100 |
|---|---|---|
| committer | Joonas Lahtinen | 2017-03-23 13:58:11 +0100 |
| commit | 5e7cd37d68673d2f51d1bdd2e60f42289831af54 (patch) | |
| tree | c714c6e09c7b03cd66b76c3067b429294c9c4efc /drivers/gpu/drm/i915/intel_uc.h | |
| parent | drm/i915/guc: Break out the GuC log extras into their own "runtime" struct (diff) | |
| download | kernel-qcow2-linux-5e7cd37d68673d2f51d1bdd2e60f42289831af54.tar.gz kernel-qcow2-linux-5e7cd37d68673d2f51d1bdd2e60f42289831af54.tar.xz kernel-qcow2-linux-5e7cd37d68673d2f51d1bdd2e60f42289831af54.zip | |
drm/i915/guc: Make intel_guc_send a function pointer
Prepare for an alternate GuC communication interface.
v2: Make a few functions static and name them correctly while we are at it (Oscar), but
leave an intel_guc_send_mmio interface for users that require old-style communication.
v3: Send intel_uc_init_early back to the top (Michal).
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uc.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uc.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h index c6f880c365a0..3ec54a141d2e 100644 --- a/drivers/gpu/drm/i915/intel_uc.h +++ b/drivers/gpu/drm/i915/intel_uc.h @@ -176,6 +176,9 @@ struct intel_guc { /* To serialize the intel_guc_send actions */ struct mutex send_mutex; + + /* GuC's FW specific send function */ + int (*send)(struct intel_guc *guc, const u32 *data, u32 len); }; struct intel_huc { @@ -194,8 +197,12 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv); void intel_uc_fini_hw(struct drm_i915_private *dev_priv); void intel_uc_prepare_fw(struct drm_i915_private *dev_priv, struct intel_uc_fw *uc_fw); -int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len); int intel_guc_sample_forcewake(struct intel_guc *guc); +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); +} /* intel_guc_loader.c */ int intel_guc_select_fw(struct intel_guc *guc); |