On Mon, Dec 23, 2019 at 09:32:43AM -0800, Lucas De Marchi wrote:
> We are currently using a mix of platform name and acronym to name the
> functions. Let's prefer the acronym as it should be clear what platform
> it's about and it's shorter, so it doesn't go over 80 columns in a few
> cases. This converts ivybridge to ivb where appropriate.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
> Acked-by: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
> Acked-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
> drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 12 ++++++------
> drivers/gpu/drm/i915/i915_irq.c | 6 +++---
> 3 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 5093fd08f381..faf6d2527a50 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -5540,7 +5540,7 @@ static void cpt_set_fdi_bc_bifurcation(struct drm_i915_private *dev_priv, bool e
> POSTING_READ(SOUTH_CHICKEN1);
> }
>
> -static void ivybridge_update_fdi_bc_bifurcation(const struct intel_crtc_state *crtc_state)
> +static void ivb_update_fdi_bc_bifurcation(const struct intel_crtc_state *crtc_state)
> {
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> @@ -5613,7 +5613,7 @@ static void ilk_pch_enable(const struct intel_atomic_state *state,
> assert_pch_transcoder_disabled(dev_priv, pipe);
>
> if (IS_IVYBRIDGE(dev_priv))
> - ivybridge_update_fdi_bc_bifurcation(crtc_state);
> + ivb_update_fdi_bc_bifurcation(crtc_state);
>
> /* Write the TU size bits before fdi link training, so that error
> * detection works. */
> diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> index 1f80f275f3f2..6c83b350525d 100644
> --- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> +++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> @@ -139,7 +139,7 @@ static void ilk_set_fifo_underrun_reporting(struct drm_device *dev,
> ilk_disable_display_irq(dev_priv, bit);
> }
>
> -static void ivybridge_check_fifo_underruns(struct intel_crtc *crtc)
> +static void ivb_check_fifo_underruns(struct intel_crtc *crtc)
> {
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> enum pipe pipe = crtc->pipe;
> @@ -157,9 +157,9 @@ static void ivybridge_check_fifo_underruns(struct intel_crtc *crtc)
> DRM_ERROR("fifo underrun on pipe %c\n", pipe_name(pipe));
> }
>
> -static void ivybridge_set_fifo_underrun_reporting(struct drm_device *dev,
> - enum pipe pipe,
> - bool enable, bool old)
> +static void ivb_set_fifo_underrun_reporting(struct drm_device *dev,
> + enum pipe pipe, bool enable,
> + bool old)
> {
> struct drm_i915_private *dev_priv = to_i915(dev);
> if (enable) {
> @@ -266,7 +266,7 @@ static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev,
> else if (IS_GEN_RANGE(dev_priv, 5, 6))
> ilk_set_fifo_underrun_reporting(dev, pipe, enable);
> else if (IS_GEN(dev_priv, 7))
> - ivybridge_set_fifo_underrun_reporting(dev, pipe, enable, old);
> + ivb_set_fifo_underrun_reporting(dev, pipe, enable, old);
> else if (INTEL_GEN(dev_priv) >= 8)
> bdw_set_fifo_underrun_reporting(dev, pipe, enable);
>
> @@ -427,7 +427,7 @@ void intel_check_cpu_fifo_underruns(struct drm_i915_private *dev_priv)
> if (HAS_GMCH(dev_priv))
> i9xx_check_fifo_underruns(crtc);
> else if (IS_GEN(dev_priv, 7))
> - ivybridge_check_fifo_underruns(crtc);
> + ivb_check_fifo_underruns(crtc);
> }
>
> spin_unlock_irq(&dev_priv->irq_lock);
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 2d6324d2922a..afc6aad9bf8c 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -893,7 +893,7 @@ int intel_get_crtc_scanline(struct intel_crtc *crtc)
> }
>
> /**
> - * ivybridge_parity_work - Workqueue called when a parity error interrupt
> + * ivb_parity_work - Workqueue called when a parity error interrupt
> * occurred.
> * @work: workqueue struct
> *
> @@ -901,7 +901,7 @@ int intel_get_crtc_scanline(struct intel_crtc *crtc)
> * this event, userspace should try to remap the bad rows since statistically
> * it is likely the same row is more likely to go bad again.
> */
> -static void ivybridge_parity_work(struct work_struct *work)
> +static void ivb_parity_work(struct work_struct *work)
> {
> struct drm_i915_private *dev_priv =
> container_of(work, typeof(*dev_priv), l3_parity.error_work);
> @@ -3899,7 +3899,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
>
> intel_hpd_init_work(dev_priv);
>
> - INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work);
> + INIT_WORK(&dev_priv->l3_parity.error_work, ivb_parity_work);
> for (i = 0; i < MAX_L3_SLICES; ++i)
> dev_priv->l3_parity.remap_info[i] = NULL;
>
> --
> 2.24.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
