Re: [Intel-gfx] [PATCH] drm/i915: Clean up some namespacing

[Jani Nikula <jani.nikula@intel.com>]

On Tue, 04 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Rename a few functions from intel_crtc_foo_init() to
> intel_foo_crtc_init() so that the namespaec clearly
> indicates what feature/file we're talking about.
>
> If left out intel_crtc_crc_init() because the whole crc

*I

> stuff uses intel_crtc_ as its namespace currently.
>
> Suggested-by: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_color.c | 2 +-
>  drivers/gpu/drm/i915/display/intel_color.h | 2 +-
>  drivers/gpu/drm/i915/display/intel_crtc.c  | 4 ++--
>  drivers/gpu/drm/i915/display/intel_drrs.c  | 4 ++--
>  drivers/gpu/drm/i915/display/intel_drrs.h  | 2 +-
>  5 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
> index 0c73b2ba1283..fc23d5d8f7fd 100644
> --- a/drivers/gpu/drm/i915/display/intel_color.c
> +++ b/drivers/gpu/drm/i915/display/intel_color.c
> @@ -2209,7 +2209,7 @@ static const struct intel_color_funcs ilk_color_funcs = {
>  	.read_luts = ilk_read_luts,
>  };
>  
> -void intel_crtc_color_init(struct intel_crtc *crtc)
> +void intel_color_crtc_init(struct intel_crtc *crtc)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>  	bool has_ctm = INTEL_INFO(dev_priv)->display.color.degamma_lut_size != 0;
> diff --git a/drivers/gpu/drm/i915/display/intel_color.h b/drivers/gpu/drm/i915/display/intel_color.h
> index 67702451e2fd..04984e6000b6 100644
> --- a/drivers/gpu/drm/i915/display/intel_color.h
> +++ b/drivers/gpu/drm/i915/display/intel_color.h
> @@ -14,7 +14,7 @@ struct drm_i915_private;
>  struct drm_property_blob;
>  
>  void intel_color_init_hooks(struct drm_i915_private *i915);
> -void intel_crtc_color_init(struct intel_crtc *crtc);
> +void intel_color_crtc_init(struct intel_crtc *crtc);
>  int intel_color_check(struct intel_crtc_state *crtc_state);
>  void intel_color_commit_noarm(const struct intel_crtc_state *crtc_state);
>  void intel_color_commit_arm(const struct intel_crtc_state *crtc_state);
> diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
> index 2d9fc7383bfc..6be1fe34c83b 100644
> --- a/drivers/gpu/drm/i915/display/intel_crtc.c
> +++ b/drivers/gpu/drm/i915/display/intel_crtc.c
> @@ -365,8 +365,8 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)
>  						BIT(DRM_SCALING_FILTER_DEFAULT) |
>  						BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR));
>  
> -	intel_crtc_color_init(crtc);
> -	intel_crtc_drrs_init(crtc);
> +	intel_color_crtc_init(crtc);
> +	intel_drrs_crtc_init(crtc);
>  	intel_crtc_crc_init(crtc);
>  
>  	cpu_latency_qos_add_request(&crtc->vblank_pm_qos, PM_QOS_DEFAULT_VALUE);
> diff --git a/drivers/gpu/drm/i915/display/intel_drrs.c b/drivers/gpu/drm/i915/display/intel_drrs.c
> index 2b94a62ef65a..e27408efaae2 100644
> --- a/drivers/gpu/drm/i915/display/intel_drrs.c
> +++ b/drivers/gpu/drm/i915/display/intel_drrs.c
> @@ -284,14 +284,14 @@ void intel_drrs_flush(struct drm_i915_private *dev_priv,
>  }
>  
>  /**
> - * intel_crtc_drrs_init - Init DRRS for CRTC
> + * intel_drrs_crtc_init - Init DRRS for CRTC
>   * @crtc: crtc
>   *
>   * This function is called only once at driver load to initialize basic
>   * DRRS stuff.
>   *
>   */
> -void intel_crtc_drrs_init(struct intel_crtc *crtc)
> +void intel_drrs_crtc_init(struct intel_crtc *crtc)
>  {
>  	INIT_DELAYED_WORK(&crtc->drrs.work, intel_drrs_downclock_work);
>  	mutex_init(&crtc->drrs.mutex);
> diff --git a/drivers/gpu/drm/i915/display/intel_drrs.h b/drivers/gpu/drm/i915/display/intel_drrs.h
> index 041248bf5d67..8ef5f93a80ff 100644
> --- a/drivers/gpu/drm/i915/display/intel_drrs.h
> +++ b/drivers/gpu/drm/i915/display/intel_drrs.h
> @@ -23,7 +23,7 @@ void intel_drrs_invalidate(struct drm_i915_private *dev_priv,
>  			   unsigned int frontbuffer_bits);
>  void intel_drrs_flush(struct drm_i915_private *dev_priv,
>  		      unsigned int frontbuffer_bits);
> -void intel_crtc_drrs_init(struct intel_crtc *crtc);
> +void intel_drrs_crtc_init(struct intel_crtc *crtc);
>  void intel_drrs_crtc_debugfs_add(struct intel_crtc *crtc);
>  void intel_drrs_connector_debugfs_add(struct intel_connector *connector);

-- 
Jani Nikula, Intel Open Source Graphics Center