On Mon, Dec 23, 2019 at 09:32:42AM -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 broadwell to bdw where appropriate.
>
> Signed-off-by: Lucas De Marchi <lucas.demar...@intel.com>
> Acked-by: Jani Nikula <jani.nik...@linux.intel.com>
> Acked-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.ro...@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 6 +++---
> drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +-
> drivers/gpu/drm/i915/gvt/handlers.c | 8 ++++----
> drivers/gpu/drm/i915/i915_debugfs.c | 6 +++---
> drivers/gpu/drm/i915/intel_device_info.c | 4 ++--
> 5 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> index d6e0d0be842e..1f80f275f3f2 100644
> --- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> +++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> @@ -180,8 +180,8 @@ static void ivybridge_set_fifo_underrun_reporting(struct
> drm_device *dev,
> }
> }
>
> -static void broadwell_set_fifo_underrun_reporting(struct drm_device *dev,
> - enum pipe pipe, bool enable)
> +static void bdw_set_fifo_underrun_reporting(struct drm_device *dev,
> + enum pipe pipe, bool enable)
> {
> struct drm_i915_private *dev_priv = to_i915(dev);
>
> @@ -268,7 +268,7 @@ static bool
> __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev,
> else if (IS_GEN(dev_priv, 7))
> ivybridge_set_fifo_underrun_reporting(dev, pipe, enable, old);
> else if (INTEL_GEN(dev_priv) >= 8)
> - broadwell_set_fifo_underrun_reporting(dev, pipe, enable);
> + bdw_set_fifo_underrun_reporting(dev, pipe, enable);
>
> return old;
> }
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> index 195ccf7db272..4e292d4bf7b9 100644
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> @@ -254,7 +254,7 @@ static void bdw_ctx_workarounds_init(struct
> intel_engine_cs *engine,
>
> /* WaDisableDopClockGating:bdw
> *
> - * Also see the related UCGTCL1 write in broadwell_init_clock_gating()
> + * Also see the related UCGTCL1 write in bdw_init_clock_gating()
> * to disable EUTC clock gating.
> */
> WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2,
> diff --git a/drivers/gpu/drm/i915/gvt/handlers.c
> b/drivers/gpu/drm/i915/gvt/handlers.c
> index 1043e6d564df..6d28d72e6c7e 100644
> --- a/drivers/gpu/drm/i915/gvt/handlers.c
> +++ b/drivers/gpu/drm/i915/gvt/handlers.c
> @@ -2691,7 +2691,7 @@ static int init_generic_mmio_info(struct intel_gvt *gvt)
> return 0;
> }
>
> -static int init_broadwell_mmio_info(struct intel_gvt *gvt)
> +static int init_bdw_mmio_info(struct intel_gvt *gvt)
> {
> struct drm_i915_private *dev_priv = gvt->dev_priv;
> int ret;
> @@ -3380,20 +3380,20 @@ int intel_gvt_setup_mmio_info(struct intel_gvt *gvt)
> goto err;
>
> if (IS_BROADWELL(dev_priv)) {
> - ret = init_broadwell_mmio_info(gvt);
> + ret = init_bdw_mmio_info(gvt);
> if (ret)
> goto err;
> } else if (IS_SKYLAKE(dev_priv)
> || IS_KABYLAKE(dev_priv)
> || IS_COFFEELAKE(dev_priv)) {
> - ret = init_broadwell_mmio_info(gvt);
> + ret = init_bdw_mmio_info(gvt);
> if (ret)
> goto err;
> ret = init_skl_mmio_info(gvt);
> if (ret)
> goto err;
> } else if (IS_BROXTON(dev_priv)) {
> - ret = init_broadwell_mmio_info(gvt);
> + ret = init_bdw_mmio_info(gvt);
> if (ret)
> goto err;
> ret = init_skl_mmio_info(gvt);
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c
> b/drivers/gpu/drm/i915/i915_debugfs.c
> index 0407229251bc..cb34e8c31511 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -3815,8 +3815,8 @@ static void gen9_sseu_device_status(struct
> drm_i915_private *dev_priv,
> #undef SS_MAX
> }
>
> -static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv,
> - struct sseu_dev_info *sseu)
> +static void bdw_sseu_device_status(struct drm_i915_private *dev_priv,
> + struct sseu_dev_info *sseu)
> {
> const struct intel_runtime_info *info = RUNTIME_INFO(dev_priv);
> u32 slice_info = I915_READ(GEN8_GT_SLICE_INFO);
> @@ -3901,7 +3901,7 @@ static int i915_sseu_status(struct seq_file *m, void
> *unused)
> if (IS_CHERRYVIEW(dev_priv))
> cherryview_sseu_device_status(dev_priv, &sseu);
> else if (IS_BROADWELL(dev_priv))
> - broadwell_sseu_device_status(dev_priv, &sseu);
> + bdw_sseu_device_status(dev_priv, &sseu);
> else if (IS_GEN(dev_priv, 9))
> gen9_sseu_device_status(dev_priv, &sseu);
> else if (INTEL_GEN(dev_priv) >= 10)
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c
> b/drivers/gpu/drm/i915/intel_device_info.c
> index ca7a42e1d769..d87c31444fa8 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -519,7 +519,7 @@ static void gen9_sseu_info_init(struct drm_i915_private
> *dev_priv)
> }
> }
>
> -static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv)
> +static void bdw_sseu_info_init(struct drm_i915_private *dev_priv)
> {
> struct sseu_dev_info *sseu = &RUNTIME_INFO(dev_priv)->sseu;
> int s, ss;
> @@ -1025,7 +1025,7 @@ void intel_device_info_runtime_init(struct
> drm_i915_private *dev_priv)
> else if (IS_CHERRYVIEW(dev_priv))
> cherryview_sseu_info_init(dev_priv);
> else if (IS_BROADWELL(dev_priv))
> - broadwell_sseu_info_init(dev_priv);
> + bdw_sseu_info_init(dev_priv);
> else if (IS_GEN(dev_priv, 9))
> gen9_sseu_info_init(dev_priv);
> else if (IS_GEN(dev_priv, 10))
> --
> 2.24.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
