| Message ID | 20170804162712.20468-3-michal.wajdeczko@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 8/4/2017 9:26 AM, Michal Wajdeczko wrote: > This is a preparation step for the upcoming patches. > We already can return some small data decoded from the command > status, but we will need more in the future. > > Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> > Cc: Oscar Mateo <oscar.mateo@intel.com> > Cc: Michel Thierry <michel.thierry@intel.com> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > --- > drivers/gpu/drm/i915/intel_guc_ct.c | 7 ++++--- > drivers/gpu/drm/i915/intel_uc.c | 6 ++++-- > drivers/gpu/drm/i915/intel_uc.h | 8 ++++---- > 3 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_guc_ct.c b/drivers/gpu/drm/i915/intel_guc_ct.c > index 1249868..c17cb42 100644 > --- a/drivers/gpu/drm/i915/intel_guc_ct.c > +++ b/drivers/gpu/drm/i915/intel_guc_ct.c > @@ -79,7 +79,7 @@ static int guc_action_register_ct_buffer(struct intel_guc *guc, > int err; > > /* Can't use generic send(), CT registration must go over MMIO */ > - err = intel_guc_send_mmio(guc, action, ARRAY_SIZE(action)); > + err = intel_guc_send_mmio(guc, action, ARRAY_SIZE(action), NULL); > if (err) another one that is only checking for diff 0 (re prev patch), I know the h2g register-ct cmd shouldn't be returning any positive value though. > DRM_ERROR("CT: register %s buffer failed; err=%d\n", > guc_ct_buffer_type_to_str(type), err); > @@ -98,7 +98,7 @@ static int guc_action_deregister_ct_buffer(struct intel_guc *guc, > int err; > > /* Can't use generic send(), CT deregistration must go over MMIO */ > - err = intel_guc_send_mmio(guc, action, ARRAY_SIZE(action)); > + err = intel_guc_send_mmio(guc, action, ARRAY_SIZE(action), NULL); > if (err) > DRM_ERROR("CT: deregister %s buffer failed; owner=%d err=%d\n", > guc_ct_buffer_type_to_str(type), owner, err); > @@ -395,7 +395,8 @@ static int ctch_send(struct intel_guc *guc, > /* > * Command Transport (CT) buffer based GuC send function. > */ > -static int intel_guc_send_ct(struct intel_guc *guc, const u32 *action, u32 len) > +static int intel_guc_send_ct(struct intel_guc *guc, const u32 *action, u32 len, > + u32 *response) > { > struct intel_guc_ct_channel *ctch = &guc->ct.host_channel; > u32 status = ~0; /* undefined */ > diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c > index ff25477..77da750 100644 > --- a/drivers/gpu/drm/i915/intel_uc.c > +++ b/drivers/gpu/drm/i915/intel_uc.c > @@ -459,7 +459,8 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv) > i915_ggtt_disable_guc(dev_priv); > } > > -int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len) > +int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len, > + u32 *response) > { > WARN(1, "Unexpected send: action=%#x\n", *action); > return -ENODEV; > @@ -468,7 +469,8 @@ int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len) > /* > * This function implements the MMIO based host to GuC interface. > */ > -int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len) > +int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, > + u32 *response) > { > struct drm_i915_private *dev_priv = guc_to_i915(guc); > u32 status; > diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h > index 22ae52b..53ea5f1 100644 > --- a/drivers/gpu/drm/i915/intel_uc.h > +++ b/drivers/gpu/drm/i915/intel_uc.h > @@ -206,7 +206,7 @@ struct intel_guc { > struct mutex send_mutex; > > /* GuC's FW specific send function */ > - int (*send)(struct intel_guc *guc, const u32 *data, u32 len); > + int (*send)(struct intel_guc *guc, const u32 *data, u32 len, u32 *resp); > > /* GuC's FW specific notify function */ > void (*notify)(struct intel_guc *guc); > @@ -227,12 +227,12 @@ void intel_uc_fini_fw(struct drm_i915_private *dev_priv); > int intel_uc_init_hw(struct drm_i915_private *dev_priv); > 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); > +int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len, u32 *response); > +int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, u32 *response); > > static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len) > { > - return guc->send(guc, action, len); > + return guc->send(guc, action, len, NULL); > } > > static inline void intel_guc_notify(struct intel_guc *guc) > Reviewed-by: Michel Thierry <michel.thierry@intel.com>
diff --git a/drivers/gpu/drm/i915/intel_guc_ct.c b/drivers/gpu/drm/i915/intel_guc_ct.c index 1249868..c17cb42 100644 --- a/drivers/gpu/drm/i915/intel_guc_ct.c +++ b/drivers/gpu/drm/i915/intel_guc_ct.c @@ -79,7 +79,7 @@ static int guc_action_register_ct_buffer(struct intel_guc *guc, int err; /* Can't use generic send(), CT registration must go over MMIO */ - err = intel_guc_send_mmio(guc, action, ARRAY_SIZE(action)); + err = intel_guc_send_mmio(guc, action, ARRAY_SIZE(action), NULL); if (err) DRM_ERROR("CT: register %s buffer failed; err=%d\n", guc_ct_buffer_type_to_str(type), err); @@ -98,7 +98,7 @@ static int guc_action_deregister_ct_buffer(struct intel_guc *guc, int err; /* Can't use generic send(), CT deregistration must go over MMIO */ - err = intel_guc_send_mmio(guc, action, ARRAY_SIZE(action)); + err = intel_guc_send_mmio(guc, action, ARRAY_SIZE(action), NULL); if (err) DRM_ERROR("CT: deregister %s buffer failed; owner=%d err=%d\n", guc_ct_buffer_type_to_str(type), owner, err); @@ -395,7 +395,8 @@ static int ctch_send(struct intel_guc *guc, /* * Command Transport (CT) buffer based GuC send function. */ -static int intel_guc_send_ct(struct intel_guc *guc, const u32 *action, u32 len) +static int intel_guc_send_ct(struct intel_guc *guc, const u32 *action, u32 len, + u32 *response) { struct intel_guc_ct_channel *ctch = &guc->ct.host_channel; u32 status = ~0; /* undefined */ diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index ff25477..77da750 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -459,7 +459,8 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv) i915_ggtt_disable_guc(dev_priv); } -int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len) +int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len, + u32 *response) { WARN(1, "Unexpected send: action=%#x\n", *action); return -ENODEV; @@ -468,7 +469,8 @@ int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len) /* * This function implements the MMIO based host to GuC interface. */ -int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len) +int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, + u32 *response) { struct drm_i915_private *dev_priv = guc_to_i915(guc); u32 status; diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h index 22ae52b..53ea5f1 100644 --- a/drivers/gpu/drm/i915/intel_uc.h +++ b/drivers/gpu/drm/i915/intel_uc.h @@ -206,7 +206,7 @@ struct intel_guc { struct mutex send_mutex; /* GuC's FW specific send function */ - int (*send)(struct intel_guc *guc, const u32 *data, u32 len); + int (*send)(struct intel_guc *guc, const u32 *data, u32 len, u32 *resp); /* GuC's FW specific notify function */ void (*notify)(struct intel_guc *guc); @@ -227,12 +227,12 @@ void intel_uc_fini_fw(struct drm_i915_private *dev_priv); int intel_uc_init_hw(struct drm_i915_private *dev_priv); 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); +int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len, u32 *response); +int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, u32 *response); static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len) { - return guc->send(guc, action, len); + return guc->send(guc, action, len, NULL); } static inline void intel_guc_notify(struct intel_guc *guc)
This is a preparation step for the upcoming patches. We already can return some small data decoded from the command status, but we will need more in the future. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Oscar Mateo <oscar.mateo@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> --- drivers/gpu/drm/i915/intel_guc_ct.c | 7 ++++--- drivers/gpu/drm/i915/intel_uc.c | 6 ++++-- drivers/gpu/drm/i915/intel_uc.h | 8 ++++---- 3 files changed, 12 insertions(+), 9 deletions(-)