drm/i915: prefer 3-letter acronym for broadwell

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.demarchi@intel.com>
Acked-by: Jani Nikula <jani.nikula@linux.intel.com>
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191224084012.24241-8-lucas.demarchi@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
index d6e0d0be842ea13abcb791405ac13f53c208cab4..1f80f275f3f2b47371bb0c795449641a383c60cf 100644 (file)
--- 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 195ccf7db272b356e40b6c5e8e0cdd53c6f9329a..4e292d4bf7b9d2aeaf79dccb8b99992b62a3c046 100644 (file)
--- 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 bb9fe6bf5275d2eb60f1dd132b333e3ca39260df..21af822a79e04a109107559d7aa68f4cb3bb901f 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -2675,7 +2675,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;
@@ -3364,20 +3364,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 db24c88d7ea62efabe1e9c49e1ce93755f1b2152..0ac98e39eb75ed3729fcba008bc0ac9f7379126d 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -3819,8 +3819,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);
@@ -3905,7 +3905,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 ca7a42e1d769e663e2865730dc12a522b1a1d779..d87c31444fa88412d63d313a93c39b84769b5dd5 100644 (file)
--- 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))