Commit 72588ffd authored by Lucas De Marchi's avatar Lucas De Marchi

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: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@linux.intel.com>
Acked-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191224084012.24241-8-lucas.demarchi@intel.com
parent 9eae5e27
...@@ -180,7 +180,7 @@ static void ivybridge_set_fifo_underrun_reporting(struct drm_device *dev, ...@@ -180,7 +180,7 @@ static void ivybridge_set_fifo_underrun_reporting(struct drm_device *dev,
} }
} }
static void broadwell_set_fifo_underrun_reporting(struct drm_device *dev, static void bdw_set_fifo_underrun_reporting(struct drm_device *dev,
enum pipe pipe, bool enable) enum pipe pipe, bool enable)
{ {
struct drm_i915_private *dev_priv = to_i915(dev); 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, ...@@ -268,7 +268,7 @@ static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev,
else if (IS_GEN(dev_priv, 7)) else if (IS_GEN(dev_priv, 7))
ivybridge_set_fifo_underrun_reporting(dev, pipe, enable, old); ivybridge_set_fifo_underrun_reporting(dev, pipe, enable, old);
else if (INTEL_GEN(dev_priv) >= 8) 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; return old;
} }
......
...@@ -254,7 +254,7 @@ static void bdw_ctx_workarounds_init(struct intel_engine_cs *engine, ...@@ -254,7 +254,7 @@ static void bdw_ctx_workarounds_init(struct intel_engine_cs *engine,
/* WaDisableDopClockGating:bdw /* 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. * to disable EUTC clock gating.
*/ */
WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2, WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2,
......
...@@ -2675,7 +2675,7 @@ static int init_generic_mmio_info(struct intel_gvt *gvt) ...@@ -2675,7 +2675,7 @@ static int init_generic_mmio_info(struct intel_gvt *gvt)
return 0; 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; struct drm_i915_private *dev_priv = gvt->dev_priv;
int ret; int ret;
...@@ -3364,20 +3364,20 @@ int intel_gvt_setup_mmio_info(struct intel_gvt *gvt) ...@@ -3364,20 +3364,20 @@ int intel_gvt_setup_mmio_info(struct intel_gvt *gvt)
goto err; goto err;
if (IS_BROADWELL(dev_priv)) { if (IS_BROADWELL(dev_priv)) {
ret = init_broadwell_mmio_info(gvt); ret = init_bdw_mmio_info(gvt);
if (ret) if (ret)
goto err; goto err;
} else if (IS_SKYLAKE(dev_priv) } else if (IS_SKYLAKE(dev_priv)
|| IS_KABYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)
|| IS_COFFEELAKE(dev_priv)) { || IS_COFFEELAKE(dev_priv)) {
ret = init_broadwell_mmio_info(gvt); ret = init_bdw_mmio_info(gvt);
if (ret) if (ret)
goto err; goto err;
ret = init_skl_mmio_info(gvt); ret = init_skl_mmio_info(gvt);
if (ret) if (ret)
goto err; goto err;
} else if (IS_BROXTON(dev_priv)) { } else if (IS_BROXTON(dev_priv)) {
ret = init_broadwell_mmio_info(gvt); ret = init_bdw_mmio_info(gvt);
if (ret) if (ret)
goto err; goto err;
ret = init_skl_mmio_info(gvt); ret = init_skl_mmio_info(gvt);
......
...@@ -3819,7 +3819,7 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, ...@@ -3819,7 +3819,7 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv,
#undef SS_MAX #undef SS_MAX
} }
static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv, static void bdw_sseu_device_status(struct drm_i915_private *dev_priv,
struct sseu_dev_info *sseu) struct sseu_dev_info *sseu)
{ {
const struct intel_runtime_info *info = RUNTIME_INFO(dev_priv); const struct intel_runtime_info *info = RUNTIME_INFO(dev_priv);
...@@ -3905,7 +3905,7 @@ static int i915_sseu_status(struct seq_file *m, void *unused) ...@@ -3905,7 +3905,7 @@ static int i915_sseu_status(struct seq_file *m, void *unused)
if (IS_CHERRYVIEW(dev_priv)) if (IS_CHERRYVIEW(dev_priv))
cherryview_sseu_device_status(dev_priv, &sseu); cherryview_sseu_device_status(dev_priv, &sseu);
else if (IS_BROADWELL(dev_priv)) 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)) else if (IS_GEN(dev_priv, 9))
gen9_sseu_device_status(dev_priv, &sseu); gen9_sseu_device_status(dev_priv, &sseu);
else if (INTEL_GEN(dev_priv) >= 10) else if (INTEL_GEN(dev_priv) >= 10)
......
...@@ -519,7 +519,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv) ...@@ -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; struct sseu_dev_info *sseu = &RUNTIME_INFO(dev_priv)->sseu;
int s, ss; int s, ss;
...@@ -1025,7 +1025,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) ...@@ -1025,7 +1025,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
else if (IS_CHERRYVIEW(dev_priv)) else if (IS_CHERRYVIEW(dev_priv))
cherryview_sseu_info_init(dev_priv); cherryview_sseu_info_init(dev_priv);
else if (IS_BROADWELL(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)) else if (IS_GEN(dev_priv, 9))
gen9_sseu_info_init(dev_priv); gen9_sseu_info_init(dev_priv);
else if (IS_GEN(dev_priv, 10)) else if (IS_GEN(dev_priv, 10))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment