Commit f6df4d46 authored by Lucas De Marchi's avatar Lucas De Marchi

drm/i915: prefer 3-letter acronym for skylake

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 skylake to skl 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-4-lucas.demarchi@intel.com
parent 1e98f88c
...@@ -1259,7 +1259,7 @@ static void gen11_dsi_post_disable(struct intel_encoder *encoder, ...@@ -1259,7 +1259,7 @@ static void gen11_dsi_post_disable(struct intel_encoder *encoder,
intel_dsc_disable(old_crtc_state); intel_dsc_disable(old_crtc_state);
skylake_scaler_disable(old_crtc_state); skl_scaler_disable(old_crtc_state);
} }
static enum drm_mode_status gen11_dsi_mode_valid(struct drm_connector *connector, static enum drm_mode_status gen11_dsi_mode_valid(struct drm_connector *connector,
......
...@@ -3914,7 +3914,7 @@ static void intel_ddi_post_disable(struct intel_encoder *encoder, ...@@ -3914,7 +3914,7 @@ static void intel_ddi_post_disable(struct intel_encoder *encoder,
intel_dsc_disable(old_crtc_state); intel_dsc_disable(old_crtc_state);
if (INTEL_GEN(dev_priv) >= 9) if (INTEL_GEN(dev_priv) >= 9)
skylake_scaler_disable(old_crtc_state); skl_scaler_disable(old_crtc_state);
else else
ironlake_pfit_disable(old_crtc_state); ironlake_pfit_disable(old_crtc_state);
......
...@@ -165,7 +165,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc, ...@@ -165,7 +165,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config); const struct intel_crtc_state *pipe_config);
static void chv_prepare_pll(struct intel_crtc *crtc, static void chv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config); const struct intel_crtc_state *pipe_config);
static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state); static void skl_pfit_enable(const struct intel_crtc_state *crtc_state);
static void ironlake_pfit_enable(const struct intel_crtc_state *crtc_state); static void ironlake_pfit_enable(const struct intel_crtc_state *crtc_state);
static void intel_modeset_setup_hw_state(struct drm_device *dev, static void intel_modeset_setup_hw_state(struct drm_device *dev,
struct drm_modeset_acquire_ctx *ctx); struct drm_modeset_acquire_ctx *ctx);
...@@ -6002,7 +6002,7 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, ...@@ -6002,7 +6002,7 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
return 0; return 0;
} }
void skylake_scaler_disable(const struct intel_crtc_state *old_crtc_state) void skl_scaler_disable(const struct intel_crtc_state *old_crtc_state)
{ {
struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc); struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
int i; int i;
...@@ -6011,7 +6011,7 @@ void skylake_scaler_disable(const struct intel_crtc_state *old_crtc_state) ...@@ -6011,7 +6011,7 @@ void skylake_scaler_disable(const struct intel_crtc_state *old_crtc_state)
skl_detach_scaler(crtc, i); skl_detach_scaler(crtc, i);
} }
static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state) static void skl_pfit_enable(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);
...@@ -6828,7 +6828,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state, ...@@ -6828,7 +6828,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
glk_pipe_scaler_clock_gating_wa(dev_priv, pipe, true); glk_pipe_scaler_clock_gating_wa(dev_priv, pipe, true);
if (INTEL_GEN(dev_priv) >= 9) if (INTEL_GEN(dev_priv) >= 9)
skylake_pfit_enable(new_crtc_state); skl_pfit_enable(new_crtc_state);
else else
ironlake_pfit_enable(new_crtc_state); ironlake_pfit_enable(new_crtc_state);
...@@ -10100,8 +10100,8 @@ static void ironlake_get_fdi_m_n_config(struct intel_crtc *crtc, ...@@ -10100,8 +10100,8 @@ static void ironlake_get_fdi_m_n_config(struct intel_crtc *crtc,
&pipe_config->fdi_m_n, NULL); &pipe_config->fdi_m_n, NULL);
} }
static void skylake_get_pfit_config(struct intel_crtc *crtc, static void skl_get_pfit_config(struct intel_crtc *crtc,
struct intel_crtc_state *pipe_config) struct intel_crtc_state *pipe_config)
{ {
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
...@@ -10132,8 +10132,8 @@ static void skylake_get_pfit_config(struct intel_crtc *crtc, ...@@ -10132,8 +10132,8 @@ static void skylake_get_pfit_config(struct intel_crtc *crtc,
} }
static void static void
skylake_get_initial_plane_config(struct intel_crtc *crtc, skl_get_initial_plane_config(struct intel_crtc *crtc,
struct intel_initial_plane_config *plane_config) struct intel_initial_plane_config *plane_config)
{ {
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
...@@ -10501,9 +10501,8 @@ static void bxt_get_ddi_pll(struct drm_i915_private *dev_priv, ...@@ -10501,9 +10501,8 @@ static void bxt_get_ddi_pll(struct drm_i915_private *dev_priv,
pipe_config->shared_dpll = intel_get_shared_dpll_by_id(dev_priv, id); pipe_config->shared_dpll = intel_get_shared_dpll_by_id(dev_priv, id);
} }
static void skylake_get_ddi_pll(struct drm_i915_private *dev_priv, static void skl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
enum port port, struct intel_crtc_state *pipe_config)
struct intel_crtc_state *pipe_config)
{ {
enum intel_dpll_id id; enum intel_dpll_id id;
u32 temp; u32 temp;
...@@ -10731,7 +10730,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc, ...@@ -10731,7 +10730,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
else if (IS_CANNONLAKE(dev_priv)) else if (IS_CANNONLAKE(dev_priv))
cannonlake_get_ddi_pll(dev_priv, port, pipe_config); cannonlake_get_ddi_pll(dev_priv, port, pipe_config);
else if (IS_GEN9_BC(dev_priv)) else if (IS_GEN9_BC(dev_priv))
skylake_get_ddi_pll(dev_priv, port, pipe_config); skl_get_ddi_pll(dev_priv, port, pipe_config);
else if (IS_GEN9_LP(dev_priv)) else if (IS_GEN9_LP(dev_priv))
bxt_get_ddi_pll(dev_priv, port, pipe_config); bxt_get_ddi_pll(dev_priv, port, pipe_config);
else else
...@@ -10906,7 +10905,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc, ...@@ -10906,7 +10905,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
power_domain_mask |= BIT_ULL(power_domain); power_domain_mask |= BIT_ULL(power_domain);
if (INTEL_GEN(dev_priv) >= 9) if (INTEL_GEN(dev_priv) >= 9)
skylake_get_pfit_config(crtc, pipe_config); skl_get_pfit_config(crtc, pipe_config);
else else
ironlake_get_pfit_config(crtc, pipe_config); ironlake_get_pfit_config(crtc, pipe_config);
} }
...@@ -14510,7 +14509,7 @@ static void intel_pipe_fastset(const struct intel_crtc_state *old_crtc_state, ...@@ -14510,7 +14509,7 @@ static void intel_pipe_fastset(const struct intel_crtc_state *old_crtc_state,
skl_detach_scalers(new_crtc_state); skl_detach_scalers(new_crtc_state);
if (new_crtc_state->pch_pfit.enabled) if (new_crtc_state->pch_pfit.enabled)
skylake_pfit_enable(new_crtc_state); skl_pfit_enable(new_crtc_state);
} else if (HAS_PCH_SPLIT(dev_priv)) { } else if (HAS_PCH_SPLIT(dev_priv)) {
if (new_crtc_state->pch_pfit.enabled) if (new_crtc_state->pch_pfit.enabled)
ironlake_pfit_enable(new_crtc_state); ironlake_pfit_enable(new_crtc_state);
...@@ -16917,7 +16916,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) ...@@ -16917,7 +16916,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
if (INTEL_GEN(dev_priv) >= 9) { if (INTEL_GEN(dev_priv) >= 9) {
dev_priv->display.get_pipe_config = hsw_get_pipe_config; dev_priv->display.get_pipe_config = hsw_get_pipe_config;
dev_priv->display.get_initial_plane_config = dev_priv->display.get_initial_plane_config =
skylake_get_initial_plane_config; skl_get_initial_plane_config;
dev_priv->display.crtc_compute_clock = hsw_crtc_compute_clock; dev_priv->display.crtc_compute_clock = hsw_crtc_compute_clock;
dev_priv->display.crtc_enable = hsw_crtc_enable; dev_priv->display.crtc_enable = hsw_crtc_enable;
dev_priv->display.crtc_disable = hsw_crtc_disable; dev_priv->display.crtc_disable = hsw_crtc_disable;
......
...@@ -578,7 +578,7 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc, ...@@ -578,7 +578,7 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
u16 skl_scaler_calc_phase(int sub, int scale, bool chroma_center); u16 skl_scaler_calc_phase(int sub, int scale, bool chroma_center);
int skl_update_scaler_crtc(struct intel_crtc_state *crtc_state); int skl_update_scaler_crtc(struct intel_crtc_state *crtc_state);
void skylake_scaler_disable(const struct intel_crtc_state *old_crtc_state); void skl_scaler_disable(const struct intel_crtc_state *old_crtc_state);
void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state); void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state);
u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state, u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
const struct intel_plane_state *plane_state); const struct intel_plane_state *plane_state);
......
...@@ -374,7 +374,7 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, ...@@ -374,7 +374,7 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,
intel_ddi_disable_transcoder_func(old_crtc_state); intel_ddi_disable_transcoder_func(old_crtc_state);
if (INTEL_GEN(dev_priv) >= 9) if (INTEL_GEN(dev_priv) >= 9)
skylake_scaler_disable(old_crtc_state); skl_scaler_disable(old_crtc_state);
else else
ironlake_pfit_disable(old_crtc_state); ironlake_pfit_disable(old_crtc_state);
......
...@@ -895,7 +895,7 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder, ...@@ -895,7 +895,7 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder,
if (IS_GEN9_LP(dev_priv)) { if (IS_GEN9_LP(dev_priv)) {
intel_crtc_vblank_off(old_crtc_state); intel_crtc_vblank_off(old_crtc_state);
skylake_scaler_disable(old_crtc_state); skl_scaler_disable(old_crtc_state);
} }
if (is_vid_mode(intel_dsi)) { if (is_vid_mode(intel_dsi)) {
......
...@@ -127,7 +127,7 @@ struct drm_i915_mocs_table { ...@@ -127,7 +127,7 @@ struct drm_i915_mocs_table {
LE_0_PAGETABLE | LE_TC_2_LLC_ELLC | LE_LRUM(3), \ LE_0_PAGETABLE | LE_TC_2_LLC_ELLC | LE_LRUM(3), \
L3_3_WB) L3_3_WB)
static const struct drm_i915_mocs_entry skylake_mocs_table[] = { static const struct drm_i915_mocs_entry skl_mocs_table[] = {
GEN9_MOCS_ENTRIES, GEN9_MOCS_ENTRIES,
MOCS_ENTRY(I915_MOCS_CACHED, MOCS_ENTRY(I915_MOCS_CACHED,
LE_3_WB | LE_TC_2_LLC_ELLC | LE_LRUM(3), LE_3_WB | LE_TC_2_LLC_ELLC | LE_LRUM(3),
...@@ -292,9 +292,9 @@ static bool get_mocs_settings(const struct drm_i915_private *i915, ...@@ -292,9 +292,9 @@ static bool get_mocs_settings(const struct drm_i915_private *i915,
table->table = icelake_mocs_table; table->table = icelake_mocs_table;
table->n_entries = GEN11_NUM_MOCS_ENTRIES; table->n_entries = GEN11_NUM_MOCS_ENTRIES;
} else if (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915)) { } else if (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915)) {
table->size = ARRAY_SIZE(skylake_mocs_table); table->size = ARRAY_SIZE(skl_mocs_table);
table->n_entries = GEN9_NUM_MOCS_ENTRIES; table->n_entries = GEN9_NUM_MOCS_ENTRIES;
table->table = skylake_mocs_table; table->table = skl_mocs_table;
} else if (IS_GEN9_LP(i915)) { } else if (IS_GEN9_LP(i915)) {
table->size = ARRAY_SIZE(broxton_mocs_table); table->size = ARRAY_SIZE(broxton_mocs_table);
table->n_entries = GEN9_NUM_MOCS_ENTRIES; table->n_entries = GEN9_NUM_MOCS_ENTRIES;
......
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