Skip to content

Commit

Permalink
drm/i915: prefer 3-letter acronym for ironlake
Browse files Browse the repository at this point in the history
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 ironlake to ilk 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-7-lucas.demarchi@intel.com
  • Loading branch information
Lucas De Marchi committed Dec 28, 2019
1 parent 95be348 commit 9eae5e2
Show file tree
Hide file tree
Showing 11 changed files with 125 additions and 126 deletions.
8 changes: 4 additions & 4 deletions drivers/gpu/drm/i915/display/intel_crt.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ static void hsw_post_disable_crt(struct intel_encoder *encoder,

intel_ddi_disable_transcoder_func(old_crtc_state);

ironlake_pfit_disable(old_crtc_state);
ilk_pfit_disable(old_crtc_state);

intel_ddi_disable_pipe_clock(old_crtc_state);

Expand Down Expand Up @@ -351,7 +351,7 @@ intel_crt_mode_valid(struct drm_connector *connector,

/* The FDI receiver on LPT only supports 8bpc and only has 2 lanes. */
if (HAS_PCH_LPT(dev_priv) &&
(ironlake_get_lanes_required(mode->clock, 270000, 24) > 2))
ilk_get_lanes_required(mode->clock, 270000, 24) > 2)
return MODE_CLOCK_HIGH;

/* HSW/BDW FDI limited to 4k */
Expand Down Expand Up @@ -427,7 +427,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder,
return 0;
}

static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)
static bool ilk_crt_detect_hotplug(struct drm_connector *connector)
{
struct drm_device *dev = connector->dev;
struct intel_crt *crt = intel_attached_crt(connector);
Expand Down Expand Up @@ -535,7 +535,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)
int i, tries = 0;

if (HAS_PCH_SPLIT(dev_priv))
return intel_ironlake_crt_detect_hotplug(connector);
return ilk_crt_detect_hotplug(connector);

if (IS_VALLEYVIEW(dev_priv))
return valleyview_crt_detect_hotplug(connector);
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/display/intel_ddi.c
Original file line number Diff line number Diff line change
Expand Up @@ -3916,7 +3916,7 @@ static void intel_ddi_post_disable(struct intel_encoder *encoder,
if (INTEL_GEN(dev_priv) >= 9)
skl_scaler_disable(old_crtc_state);
else
ironlake_pfit_disable(old_crtc_state);
ilk_pfit_disable(old_crtc_state);

/*
* When called from DP MST code:
Expand Down
Loading

0 comments on commit 9eae5e2

Please sign in to comment.