| Message ID | 1463150195-28805-2-git-send-email-david.s.gordon@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 13/05/16 15:36, Dave Gordon wrote: > The GuC initialisation code could do other things apart from loading > firmware, so here we rename the three primary entry points to remove any > specific reference to "ucode" (no functional changes, just renaming). > > Signed-off-by: Dave Gordon <david.s.gordon@intel.com> > --- > drivers/gpu/drm/i915/i915_dma.c | 6 +++--- > drivers/gpu/drm/i915/i915_gem.c | 2 +- > drivers/gpu/drm/i915/intel_guc.h | 6 +++--- > drivers/gpu/drm/i915/intel_guc_loader.c | 19 ++++++++++--------- > 4 files changed, 17 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > index 547100f..7d93f8f 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -507,7 +507,7 @@ static int i915_load_modeset_init(struct drm_device *dev) > * working irqs for e.g. gmbus and dp aux transfers. */ > intel_modeset_init(dev); > > - intel_guc_ucode_init(dev); > + intel_guc_init(dev); > > ret = i915_gem_init(dev); > if (ret) > @@ -547,7 +547,7 @@ static int i915_load_modeset_init(struct drm_device *dev) > cleanup_gem: > i915_gem_fini(dev); > cleanup_irq: > - intel_guc_ucode_fini(dev); > + intel_guc_fini(dev); > drm_irq_uninstall(dev); > intel_teardown_gmbus(dev); > cleanup_csr: > @@ -1528,7 +1528,7 @@ int i915_driver_unload(struct drm_device *dev) > /* Flush any outstanding unpin_work. */ > flush_workqueue(dev_priv->wq); > > - intel_guc_ucode_fini(dev); > + intel_guc_fini(dev); > i915_gem_fini(dev); > intel_fbc_cleanup_cfb(dev_priv); > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index a3d826b..43e45b7 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -4867,7 +4867,7 @@ int i915_gem_init_engines(struct drm_device *dev) > > /* We can't enable contexts until all firmware is loaded */ > if (HAS_GUC_UCODE(dev)) { > - ret = intel_guc_ucode_load(dev); > + ret = intel_guc_setup(dev); > if (ret) { > DRM_ERROR("Failed to initialize GuC, error %d\n", ret); > ret = -EIO; > diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h > index 9d79c4c..3984136 100644 > --- a/drivers/gpu/drm/i915/intel_guc.h > +++ b/drivers/gpu/drm/i915/intel_guc.h > @@ -138,9 +138,9 @@ struct intel_guc { > }; > > /* intel_guc_loader.c */ > -extern void intel_guc_ucode_init(struct drm_device *dev); > -extern int intel_guc_ucode_load(struct drm_device *dev); > -extern void intel_guc_ucode_fini(struct drm_device *dev); > +extern void intel_guc_init(struct drm_device *dev); > +extern int intel_guc_setup(struct drm_device *dev); > +extern void intel_guc_fini(struct drm_device *dev); > extern const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status); > extern int intel_guc_suspend(struct drm_device *dev); > extern int intel_guc_resume(struct drm_device *dev); > diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c > index 23345e1..b14a3a3 100644 > --- a/drivers/gpu/drm/i915/intel_guc_loader.c > +++ b/drivers/gpu/drm/i915/intel_guc_loader.c > @@ -375,18 +375,19 @@ static int i915_reset_guc(struct drm_i915_private *dev_priv) > } > > /** > - * intel_guc_ucode_load() - load GuC uCode into the device > + * intel_guc_setup() - finish preparing the GuC for activity > * @dev: drm device > * > * Called from gem_init_hw() during driver loading and also after a GPU reset. > * > + * The main action required here it to load the GuC uCode into the device. > * The firmware image should have already been fetched into memory by the > - * earlier call to intel_guc_ucode_init(), so here we need only check that > - * is succeeded, and then transfer the image to the h/w. > + * earlier call to intel_guc_init(), so here we need only check that worked, > + * and then transfer the image to the h/w. > * > * Return: non-zero code on error > */ > -int intel_guc_ucode_load(struct drm_device *dev) > +int intel_guc_setup(struct drm_device *dev) > { > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; > @@ -620,15 +621,15 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw) > } > > /** > - * intel_guc_ucode_init() - define parameters and fetch firmware > + * intel_guc_init() - define parameters and fetch firmware > * @dev: drm device > * > * Called early during driver load, but after GEM is initialised. > * > * The firmware will be transferred to the GuC's memory later, > - * when intel_guc_ucode_load() is called. > + * when intel_guc_setup() is called. > */ > -void intel_guc_ucode_init(struct drm_device *dev) > +void intel_guc_init(struct drm_device *dev) > { > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; > @@ -676,10 +677,10 @@ void intel_guc_ucode_init(struct drm_device *dev) > } > > /** > - * intel_guc_ucode_fini() - clean up all allocated resources > + * intel_guc_fini() - clean up all allocated resources > * @dev: drm device > */ > -void intel_guc_ucode_fini(struct drm_device *dev) > +void intel_guc_fini(struct drm_device *dev) > { > struct drm_i915_private *dev_priv = dev->dev_private; > struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 547100f..7d93f8f 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -507,7 +507,7 @@ static int i915_load_modeset_init(struct drm_device *dev) * working irqs for e.g. gmbus and dp aux transfers. */ intel_modeset_init(dev); - intel_guc_ucode_init(dev); + intel_guc_init(dev); ret = i915_gem_init(dev); if (ret) @@ -547,7 +547,7 @@ static int i915_load_modeset_init(struct drm_device *dev) cleanup_gem: i915_gem_fini(dev); cleanup_irq: - intel_guc_ucode_fini(dev); + intel_guc_fini(dev); drm_irq_uninstall(dev); intel_teardown_gmbus(dev); cleanup_csr: @@ -1528,7 +1528,7 @@ int i915_driver_unload(struct drm_device *dev) /* Flush any outstanding unpin_work. */ flush_workqueue(dev_priv->wq); - intel_guc_ucode_fini(dev); + intel_guc_fini(dev); i915_gem_fini(dev); intel_fbc_cleanup_cfb(dev_priv); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index a3d826b..43e45b7 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4867,7 +4867,7 @@ int i915_gem_init_engines(struct drm_device *dev) /* We can't enable contexts until all firmware is loaded */ if (HAS_GUC_UCODE(dev)) { - ret = intel_guc_ucode_load(dev); + ret = intel_guc_setup(dev); if (ret) { DRM_ERROR("Failed to initialize GuC, error %d\n", ret); ret = -EIO; diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h index 9d79c4c..3984136 100644 --- a/drivers/gpu/drm/i915/intel_guc.h +++ b/drivers/gpu/drm/i915/intel_guc.h @@ -138,9 +138,9 @@ struct intel_guc { }; /* intel_guc_loader.c */ -extern void intel_guc_ucode_init(struct drm_device *dev); -extern int intel_guc_ucode_load(struct drm_device *dev); -extern void intel_guc_ucode_fini(struct drm_device *dev); +extern void intel_guc_init(struct drm_device *dev); +extern int intel_guc_setup(struct drm_device *dev); +extern void intel_guc_fini(struct drm_device *dev); extern const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status); extern int intel_guc_suspend(struct drm_device *dev); extern int intel_guc_resume(struct drm_device *dev); diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 23345e1..b14a3a3 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c @@ -375,18 +375,19 @@ static int i915_reset_guc(struct drm_i915_private *dev_priv) } /** - * intel_guc_ucode_load() - load GuC uCode into the device + * intel_guc_setup() - finish preparing the GuC for activity * @dev: drm device * * Called from gem_init_hw() during driver loading and also after a GPU reset. * + * The main action required here it to load the GuC uCode into the device. * The firmware image should have already been fetched into memory by the - * earlier call to intel_guc_ucode_init(), so here we need only check that - * is succeeded, and then transfer the image to the h/w. + * earlier call to intel_guc_init(), so here we need only check that worked, + * and then transfer the image to the h/w. * * Return: non-zero code on error */ -int intel_guc_ucode_load(struct drm_device *dev) +int intel_guc_setup(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; @@ -620,15 +621,15 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw) } /** - * intel_guc_ucode_init() - define parameters and fetch firmware + * intel_guc_init() - define parameters and fetch firmware * @dev: drm device * * Called early during driver load, but after GEM is initialised. * * The firmware will be transferred to the GuC's memory later, - * when intel_guc_ucode_load() is called. + * when intel_guc_setup() is called. */ -void intel_guc_ucode_init(struct drm_device *dev) +void intel_guc_init(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; @@ -676,10 +677,10 @@ void intel_guc_ucode_init(struct drm_device *dev) } /** - * intel_guc_ucode_fini() - clean up all allocated resources + * intel_guc_fini() - clean up all allocated resources * @dev: drm device */ -void intel_guc_ucode_fini(struct drm_device *dev) +void intel_guc_fini(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
The GuC initialisation code could do other things apart from loading firmware, so here we rename the three primary entry points to remove any specific reference to "ucode" (no functional changes, just renaming). Signed-off-by: Dave Gordon <david.s.gordon@intel.com> --- drivers/gpu/drm/i915/i915_dma.c | 6 +++--- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/intel_guc.h | 6 +++--- drivers/gpu/drm/i915/intel_guc_loader.c | 19 ++++++++++--------- 4 files changed, 17 insertions(+), 16 deletions(-)