| Message ID | 20180727233626.9216-3-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm/i915/cnl+: Reload CSR firmware when coming back from low power states | expand |
On Fri, Jul 27, 2018 at 04:36:26PM -0700, José Roberto de Souza wrote: > All other overlay functions(almost all other functions in i915) follow > intel_overlay_verb, so renaming the ones that do not match that. > > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.c | 2 +- > drivers/gpu/drm/i915/intel_display.c | 2 +- > drivers/gpu/drm/i915/intel_drv.h | 4 ++-- > drivers/gpu/drm/i915/intel_overlay.c | 4 ++-- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 3aefaa6c9483..b0c062636801 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -687,7 +687,7 @@ static int i915_load_modeset_init(struct drm_device *dev) > if (ret) > goto cleanup_modeset; > > - intel_setup_overlay(dev_priv); > + intel_overlay_setup(dev_priv); > > if (INTEL_INFO(dev_priv)->num_pipes == 0) > return 0; > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 577b30dde45b..2c03fd82d36e 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -15998,7 +15998,7 @@ void intel_modeset_cleanup(struct drm_device *dev) > > drm_mode_config_cleanup(dev); > > - intel_cleanup_overlay(dev_priv); > + intel_overlay_cleanup(dev_priv); > > intel_cleanup_gt_powersave(dev_priv); > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index c96f3b7b3eda..59caed2e6273 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1863,8 +1863,8 @@ void intel_attach_aspect_ratio_property(struct drm_connector *connector); > > > /* intel_overlay.c */ > -void intel_setup_overlay(struct drm_i915_private *dev_priv); > -void intel_cleanup_overlay(struct drm_i915_private *dev_priv); > +void intel_overlay_setup(struct drm_i915_private *dev_priv); > +void intel_overlay_cleanup(struct drm_i915_private *dev_priv); > int intel_overlay_switch_off(struct intel_overlay *overlay); > int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data, > struct drm_file *file_priv); > diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c > index c2f10d899329..a1daedefa0aa 100644 > --- a/drivers/gpu/drm/i915/intel_overlay.c > +++ b/drivers/gpu/drm/i915/intel_overlay.c > @@ -1386,7 +1386,7 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data, > return ret; > } > > -void intel_setup_overlay(struct drm_i915_private *dev_priv) > +void intel_overlay_setup(struct drm_i915_private *dev_priv) > { > struct intel_overlay *overlay; > struct drm_i915_gem_object *reg_bo; > @@ -1475,7 +1475,7 @@ void intel_setup_overlay(struct drm_i915_private *dev_priv) > return; > } > > -void intel_cleanup_overlay(struct drm_i915_private *dev_priv) > +void intel_overlay_cleanup(struct drm_i915_private *dev_priv) > { > if (!dev_priv->overlay) > return; > -- > 2.18.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 3aefaa6c9483..b0c062636801 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -687,7 +687,7 @@ static int i915_load_modeset_init(struct drm_device *dev) if (ret) goto cleanup_modeset; - intel_setup_overlay(dev_priv); + intel_overlay_setup(dev_priv); if (INTEL_INFO(dev_priv)->num_pipes == 0) return 0; diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 577b30dde45b..2c03fd82d36e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15998,7 +15998,7 @@ void intel_modeset_cleanup(struct drm_device *dev) drm_mode_config_cleanup(dev); - intel_cleanup_overlay(dev_priv); + intel_overlay_cleanup(dev_priv); intel_cleanup_gt_powersave(dev_priv); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index c96f3b7b3eda..59caed2e6273 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1863,8 +1863,8 @@ void intel_attach_aspect_ratio_property(struct drm_connector *connector); /* intel_overlay.c */ -void intel_setup_overlay(struct drm_i915_private *dev_priv); -void intel_cleanup_overlay(struct drm_i915_private *dev_priv); +void intel_overlay_setup(struct drm_i915_private *dev_priv); +void intel_overlay_cleanup(struct drm_i915_private *dev_priv); int intel_overlay_switch_off(struct intel_overlay *overlay); int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index c2f10d899329..a1daedefa0aa 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -1386,7 +1386,7 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data, return ret; } -void intel_setup_overlay(struct drm_i915_private *dev_priv) +void intel_overlay_setup(struct drm_i915_private *dev_priv) { struct intel_overlay *overlay; struct drm_i915_gem_object *reg_bo; @@ -1475,7 +1475,7 @@ void intel_setup_overlay(struct drm_i915_private *dev_priv) return; } -void intel_cleanup_overlay(struct drm_i915_private *dev_priv) +void intel_overlay_cleanup(struct drm_i915_private *dev_priv) { if (!dev_priv->overlay) return;
All other overlay functions(almost all other functions in i915) follow intel_overlay_verb, so renaming the ones that do not match that. Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 4 ++-- drivers/gpu/drm/i915/intel_overlay.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)