Commit 74bb98ba authored by Lucas De Marchi's avatar Lucas De Marchi

drm/i915: prefer 3-letter acronym for ivybridge

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: 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-9-lucas.demarchi@intel.com
parent 72588ffd
...@@ -5541,7 +5541,7 @@ static void cpt_set_fdi_bc_bifurcation(struct drm_i915_private *dev_priv, bool e ...@@ -5541,7 +5541,7 @@ static void cpt_set_fdi_bc_bifurcation(struct drm_i915_private *dev_priv, bool e
POSTING_READ(SOUTH_CHICKEN1); 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 intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
...@@ -5614,7 +5614,7 @@ static void ilk_pch_enable(const struct intel_atomic_state *state, ...@@ -5614,7 +5614,7 @@ static void ilk_pch_enable(const struct intel_atomic_state *state,
assert_pch_transcoder_disabled(dev_priv, pipe); assert_pch_transcoder_disabled(dev_priv, pipe);
if (IS_IVYBRIDGE(dev_priv)) 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 /* Write the TU size bits before fdi link training, so that error
* detection works. */ * detection works. */
......
...@@ -139,7 +139,7 @@ static void ilk_set_fifo_underrun_reporting(struct drm_device *dev, ...@@ -139,7 +139,7 @@ static void ilk_set_fifo_underrun_reporting(struct drm_device *dev,
ilk_disable_display_irq(dev_priv, bit); 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); struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
enum pipe pipe = crtc->pipe; enum pipe pipe = crtc->pipe;
...@@ -157,9 +157,9 @@ static void ivybridge_check_fifo_underruns(struct intel_crtc *crtc) ...@@ -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)); DRM_ERROR("fifo underrun on pipe %c\n", pipe_name(pipe));
} }
static void ivybridge_set_fifo_underrun_reporting(struct drm_device *dev, static void ivb_set_fifo_underrun_reporting(struct drm_device *dev,
enum pipe pipe, enum pipe pipe, bool enable,
bool enable, bool old) bool old)
{ {
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
if (enable) { if (enable) {
...@@ -266,7 +266,7 @@ static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, ...@@ -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)) else if (IS_GEN_RANGE(dev_priv, 5, 6))
ilk_set_fifo_underrun_reporting(dev, pipe, enable); ilk_set_fifo_underrun_reporting(dev, pipe, enable);
else if (IS_GEN(dev_priv, 7)) 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) else if (INTEL_GEN(dev_priv) >= 8)
bdw_set_fifo_underrun_reporting(dev, pipe, enable); bdw_set_fifo_underrun_reporting(dev, pipe, enable);
...@@ -427,7 +427,7 @@ void intel_check_cpu_fifo_underruns(struct drm_i915_private *dev_priv) ...@@ -427,7 +427,7 @@ void intel_check_cpu_fifo_underruns(struct drm_i915_private *dev_priv)
if (HAS_GMCH(dev_priv)) if (HAS_GMCH(dev_priv))
i9xx_check_fifo_underruns(crtc); i9xx_check_fifo_underruns(crtc);
else if (IS_GEN(dev_priv, 7)) else if (IS_GEN(dev_priv, 7))
ivybridge_check_fifo_underruns(crtc); ivb_check_fifo_underruns(crtc);
} }
spin_unlock_irq(&dev_priv->irq_lock); spin_unlock_irq(&dev_priv->irq_lock);
......
...@@ -893,7 +893,7 @@ int intel_get_crtc_scanline(struct intel_crtc *crtc) ...@@ -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. * occurred.
* @work: workqueue struct * @work: workqueue struct
* *
...@@ -901,7 +901,7 @@ int intel_get_crtc_scanline(struct intel_crtc *crtc) ...@@ -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 * 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. * 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 = struct drm_i915_private *dev_priv =
container_of(work, typeof(*dev_priv), l3_parity.error_work); container_of(work, typeof(*dev_priv), l3_parity.error_work);
...@@ -3899,7 +3899,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv) ...@@ -3899,7 +3899,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
intel_hpd_init_work(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) for (i = 0; i < MAX_L3_SLICES; ++i)
dev_priv->l3_parity.remap_info[i] = NULL; dev_priv->l3_parity.remap_info[i] = NULL;
......
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