On Thu, Mar 02, 2017 at 05:03:45PM +0100, Arkadiusz Hiler wrote: > GuC historically has two "startup" functions called _init() and _setup() > > Then HuC came with it's _init() and _load(). > > This commit renames intel_guc_setup() and intel_huc_load() to > *uc_init_hw() as they called from the i915_gem_init_hw(). > > The aim is to be consistent in that entry points called during > particular driver init phases (e.g. init_hw) are all suffixed by that > phase. When reading the leaf functions, it should be clear at what stage > during the driver load it is called and therefore what operations are > legal at that point. > > v2: commit message update (Chris Wilson) > > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Cc: Michal Winiarski <michal.winiarski@xxxxxxxxx> > Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx> > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@xxxxxxxxx> > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> > Reviewed-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx> > --- <snip> > @@ -190,7 +190,7 @@ int intel_guc_sample_forcewake(struct intel_guc *guc); > > /* intel_guc_loader.c */ > extern void intel_guc_init(struct drm_i915_private *dev_priv); > -extern int intel_guc_setup(struct drm_i915_private *dev_priv); > +extern int intel_guc_init_hw(struct drm_i915_private *dev_priv); In later patch (5/10) you begin to use subject/verb/object pattern in intel_guc_init_fw() intel_huc_init_fw() functions. Maybe you can do the same here: intel_guc_init_hw() intel_huc_init_hw() -Michal > extern void intel_guc_fini(struct drm_i915_private *dev_priv); > extern const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status); > extern int intel_guc_suspend(struct drm_i915_private *dev_priv); > @@ -225,7 +225,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma) > /* intel_huc.c */ > void intel_huc_init(struct drm_i915_private *dev_priv); > void intel_huc_fini(struct drm_i915_private *dev_priv); > -int intel_huc_load(struct drm_i915_private *dev_priv); > +int intel_huc_init_hw(struct drm_i915_private *dev_priv); > void intel_guc_auth_huc(struct drm_i915_private *dev_priv); > > #endif > -- > 2.9.3 > _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
