[Intel-gfx] [PATCH v3 00/10] Prefer acronym for prefixes

[Intel-gfx] [PATCH v3 00/10] Prefer acronym for prefixes

[Lucas De Marchi]

v3 of https://patchwork.freedesktop.org/series/71224/

Changes from v2:
  - Also remove gen from device_info on first patch
  - Rebase
  - Collect a-b for the entire series

Lucas De Marchi (10):
  drm/i915: simplify prefixes on device_info
  drm/i915: prefer 3-letter acronym for pineview
  drm/i915: prefer 3-letter acronym for haswell
  drm/i915: prefer 3-letter acronym for skylake
  drm/i915: prefer 3-letter acronym for cannonlake
  drm/i915: prefer 3-letter acronym for icelake
  drm/i915: prefer 3-letter acronym for ironlake
  drm/i915: prefer 3-letter acronym for broadwell
  drm/i915: prefer 3-letter acronym for ivybridge
  drm/i915: prefer 3-letter acronym for tigerlake

 drivers/gpu/drm/i915/display/icl_dsi.c        |   2 +-
 drivers/gpu/drm/i915/display/intel_crt.c      |   8 +-
 drivers/gpu/drm/i915/display/intel_ddi.c      |   8 +-
 drivers/gpu/drm/i915/display/intel_display.c  | 284 +++++++++---------
 drivers/gpu/drm/i915/display/intel_display.h  |   6 +-
 drivers/gpu/drm/i915/display/intel_dp.c       |  34 +--
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |   4 +-
 .../drm/i915/display/intel_fifo_underrun.c    |  24 +-
 drivers/gpu/drm/i915/display/vlv_dsi.c        |   2 +-
 drivers/gpu/drm/i915/gt/intel_mocs.c          |  18 +-
 drivers/gpu/drm/i915/gt/intel_reset.c         |   7 +-
 drivers/gpu/drm/i915/gt/intel_workarounds.c   |   2 +-
 drivers/gpu/drm/i915/gvt/handlers.c           |   8 +-
 drivers/gpu/drm/i915/i915_debugfs.c           |  10 +-
 drivers/gpu/drm/i915/i915_irq.c               |  18 +-
 drivers/gpu/drm/i915/i915_pci.c               | 230 +++++++-------
 drivers/gpu/drm/i915/intel_device_info.c      |   8 +-
 drivers/gpu/drm/i915/intel_pm.c               |   8 +-
 18 files changed, 338 insertions(+), 343 deletions(-)

-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v3 01/10] drm/i915: simplify prefixes on device_info

[Lucas De Marchi]

Drop the intel prefix since all these structs are static and prefer
using the 3-letter prefix for each platform.

v2: also remove gen from the device info (Ville)

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>
---
 drivers/gpu/drm/i915/i915_pci.c | 230 ++++++++++++++++----------------
 1 file changed, 115 insertions(+), 115 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 9571611b4b16..83f01401b8b5 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -193,23 +193,23 @@
 	GEN_DEFAULT_PAGE_SIZES, \
 	GEN_DEFAULT_REGIONS
 
-static const struct intel_device_info intel_i830_info = {
+static const struct intel_device_info i830_info = {
 	I830_FEATURES,
 	PLATFORM(INTEL_I830),
 };
 
-static const struct intel_device_info intel_i845g_info = {
+static const struct intel_device_info i845g_info = {
 	I845_FEATURES,
 	PLATFORM(INTEL_I845G),
 };
 
-static const struct intel_device_info intel_i85x_info = {
+static const struct intel_device_info i85x_info = {
 	I830_FEATURES,
 	PLATFORM(INTEL_I85X),
 	.display.has_fbc = 1,
 };
 
-static const struct intel_device_info intel_i865g_info = {
+static const struct intel_device_info i865g_info = {
 	I845_FEATURES,
 	PLATFORM(INTEL_I865G),
 };
@@ -228,7 +228,7 @@ static const struct intel_device_info intel_i865g_info = {
 	GEN_DEFAULT_PAGE_SIZES, \
 	GEN_DEFAULT_REGIONS
 
-static const struct intel_device_info intel_i915g_info = {
+static const struct intel_device_info i915g_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_I915G),
 	.has_coherent_ggtt = false,
@@ -239,7 +239,7 @@ static const struct intel_device_info intel_i915g_info = {
 	.unfenced_needs_alignment = 1,
 };
 
-static const struct intel_device_info intel_i915gm_info = {
+static const struct intel_device_info i915gm_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_I915GM),
 	.is_mobile = 1,
@@ -252,7 +252,7 @@ static const struct intel_device_info intel_i915gm_info = {
 	.unfenced_needs_alignment = 1,
 };
 
-static const struct intel_device_info intel_i945g_info = {
+static const struct intel_device_info i945g_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_I945G),
 	.display.has_hotplug = 1,
@@ -263,7 +263,7 @@ static const struct intel_device_info intel_i945g_info = {
 	.unfenced_needs_alignment = 1,
 };
 
-static const struct intel_device_info intel_i945gm_info = {
+static const struct intel_device_info i945gm_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_I945GM),
 	.is_mobile = 1,
@@ -277,21 +277,21 @@ static const struct intel_device_info intel_i945gm_info = {
 	.unfenced_needs_alignment = 1,
 };
 
-static const struct intel_device_info intel_g33_info = {
+static const struct intel_device_info g33_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_G33),
 	.display.has_hotplug = 1,
 	.display.has_overlay = 1,
 };
 
-static const struct intel_device_info intel_pineview_g_info = {
+static const struct intel_device_info pnv_g_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_PINEVIEW),
 	.display.has_hotplug = 1,
 	.display.has_overlay = 1,
 };
 
-static const struct intel_device_info intel_pineview_m_info = {
+static const struct intel_device_info pnv_m_info = {
 	GEN3_FEATURES,
 	PLATFORM(INTEL_PINEVIEW),
 	.is_mobile = 1,
@@ -314,7 +314,7 @@ static const struct intel_device_info intel_pineview_m_info = {
 	GEN_DEFAULT_PAGE_SIZES, \
 	GEN_DEFAULT_REGIONS
 
-static const struct intel_device_info intel_i965g_info = {
+static const struct intel_device_info i965g_info = {
 	GEN4_FEATURES,
 	PLATFORM(INTEL_I965G),
 	.display.has_overlay = 1,
@@ -322,7 +322,7 @@ static const struct intel_device_info intel_i965g_info = {
 	.has_snoop = false,
 };
 
-static const struct intel_device_info intel_i965gm_info = {
+static const struct intel_device_info i965gm_info = {
 	GEN4_FEATURES,
 	PLATFORM(INTEL_I965GM),
 	.is_mobile = 1,
@@ -333,14 +333,14 @@ static const struct intel_device_info intel_i965gm_info = {
 	.has_snoop = false,
 };
 
-static const struct intel_device_info intel_g45_info = {
+static const struct intel_device_info g45_info = {
 	GEN4_FEATURES,
 	PLATFORM(INTEL_G45),
 	.engine_mask = BIT(RCS0) | BIT(VCS0),
 	.gpu_reset_clobbers_display = false,
 };
 
-static const struct intel_device_info intel_gm45_info = {
+static const struct intel_device_info gm45_info = {
 	GEN4_FEATURES,
 	PLATFORM(INTEL_GM45),
 	.is_mobile = 1,
@@ -365,12 +365,12 @@ static const struct intel_device_info intel_gm45_info = {
 	GEN_DEFAULT_PAGE_SIZES, \
 	GEN_DEFAULT_REGIONS
 
-static const struct intel_device_info intel_ironlake_d_info = {
+static const struct intel_device_info ilk_d_info = {
 	GEN5_FEATURES,
 	PLATFORM(INTEL_IRONLAKE),
 };
 
-static const struct intel_device_info intel_ironlake_m_info = {
+static const struct intel_device_info ilk_m_info = {
 	GEN5_FEATURES,
 	PLATFORM(INTEL_IRONLAKE),
 	.is_mobile = 1,
@@ -400,12 +400,12 @@ static const struct intel_device_info intel_ironlake_m_info = {
 	GEN6_FEATURES, \
 	PLATFORM(INTEL_SANDYBRIDGE)
 
-static const struct intel_device_info intel_sandybridge_d_gt1_info = {
+static const struct intel_device_info snb_d_gt1_info = {
 	SNB_D_PLATFORM,
 	.gt = 1,
 };
 
-static const struct intel_device_info intel_sandybridge_d_gt2_info = {
+static const struct intel_device_info snb_d_gt2_info = {
 	SNB_D_PLATFORM,
 	.gt = 2,
 };
@@ -416,12 +416,12 @@ static const struct intel_device_info intel_sandybridge_d_gt2_info = {
 	.is_mobile = 1
 
 
-static const struct intel_device_info intel_sandybridge_m_gt1_info = {
+static const struct intel_device_info snb_m_gt1_info = {
 	SNB_M_PLATFORM,
 	.gt = 1,
 };
 
-static const struct intel_device_info intel_sandybridge_m_gt2_info = {
+static const struct intel_device_info snb_m_gt2_info = {
 	SNB_M_PLATFORM,
 	.gt = 2,
 };
@@ -450,12 +450,12 @@ static const struct intel_device_info intel_sandybridge_m_gt2_info = {
 	PLATFORM(INTEL_IVYBRIDGE), \
 	.has_l3_dpf = 1
 
-static const struct intel_device_info intel_ivybridge_d_gt1_info = {
+static const struct intel_device_info ivb_d_gt1_info = {
 	IVB_D_PLATFORM,
 	.gt = 1,
 };
 
-static const struct intel_device_info intel_ivybridge_d_gt2_info = {
+static const struct intel_device_info ivb_d_gt2_info = {
 	IVB_D_PLATFORM,
 	.gt = 2,
 };
@@ -466,17 +466,17 @@ static const struct intel_device_info intel_ivybridge_d_gt2_info = {
 	.is_mobile = 1, \
 	.has_l3_dpf = 1
 
-static const struct intel_device_info intel_ivybridge_m_gt1_info = {
+static const struct intel_device_info ivb_m_gt1_info = {
 	IVB_M_PLATFORM,
 	.gt = 1,
 };
 
-static const struct intel_device_info intel_ivybridge_m_gt2_info = {
+static const struct intel_device_info ivb_m_gt2_info = {
 	IVB_M_PLATFORM,
 	.gt = 2,
 };
 
-static const struct intel_device_info intel_ivybridge_q_info = {
+static const struct intel_device_info ivb_q_info = {
 	GEN7_FEATURES,
 	PLATFORM(INTEL_IVYBRIDGE),
 	.gt = 2,
@@ -484,7 +484,7 @@ static const struct intel_device_info intel_ivybridge_q_info = {
 	.has_l3_dpf = 1,
 };
 
-static const struct intel_device_info intel_valleyview_info = {
+static const struct intel_device_info vlv_info = {
 	PLATFORM(INTEL_VALLEYVIEW),
 	GEN(7),
 	.is_lp = 1,
@@ -523,17 +523,17 @@ static const struct intel_device_info intel_valleyview_info = {
 	PLATFORM(INTEL_HASWELL), \
 	.has_l3_dpf = 1
 
-static const struct intel_device_info intel_haswell_gt1_info = {
+static const struct intel_device_info hsw_gt1_info = {
 	HSW_PLATFORM,
 	.gt = 1,
 };
 
-static const struct intel_device_info intel_haswell_gt2_info = {
+static const struct intel_device_info hsw_gt2_info = {
 	HSW_PLATFORM,
 	.gt = 2,
 };
 
-static const struct intel_device_info intel_haswell_gt3_info = {
+static const struct intel_device_info hsw_gt3_info = {
 	HSW_PLATFORM,
 	.gt = 3,
 };
@@ -551,17 +551,17 @@ static const struct intel_device_info intel_haswell_gt3_info = {
 	GEN8_FEATURES, \
 	PLATFORM(INTEL_BROADWELL)
 
-static const struct intel_device_info intel_broadwell_gt1_info = {
+static const struct intel_device_info bdw_gt1_info = {
 	BDW_PLATFORM,
 	.gt = 1,
 };
 
-static const struct intel_device_info intel_broadwell_gt2_info = {
+static const struct intel_device_info bdw_gt2_info = {
 	BDW_PLATFORM,
 	.gt = 2,
 };
 
-static const struct intel_device_info intel_broadwell_rsvd_info = {
+static const struct intel_device_info bdw_rsvd_info = {
 	BDW_PLATFORM,
 	.gt = 3,
 	/* According to the device ID those devices are GT3, they were
@@ -569,14 +569,14 @@ static const struct intel_device_info intel_broadwell_rsvd_info = {
 	 */
 };
 
-static const struct intel_device_info intel_broadwell_gt3_info = {
+static const struct intel_device_info bdw_gt3_info = {
 	BDW_PLATFORM,
 	.gt = 3,
 	.engine_mask =
 		BIT(RCS0) | BIT(VCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS1),
 };
 
-static const struct intel_device_info intel_cherryview_info = {
+static const struct intel_device_info chv_info = {
 	PLATFORM(INTEL_CHERRYVIEW),
 	GEN(8),
 	.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C),
@@ -621,12 +621,12 @@ static const struct intel_device_info intel_cherryview_info = {
 	GEN9_FEATURES, \
 	PLATFORM(INTEL_SKYLAKE)
 
-static const struct intel_device_info intel_skylake_gt1_info = {
+static const struct intel_device_info skl_gt1_info = {
 	SKL_PLATFORM,
 	.gt = 1,
 };
 
-static const struct intel_device_info intel_skylake_gt2_info = {
+static const struct intel_device_info skl_gt2_info = {
 	SKL_PLATFORM,
 	.gt = 2,
 };
@@ -637,12 +637,12 @@ static const struct intel_device_info intel_skylake_gt2_info = {
 		BIT(RCS0) | BIT(VCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS1)
 
 
-static const struct intel_device_info intel_skylake_gt3_info = {
+static const struct intel_device_info skl_gt3_info = {
 	SKL_GT3_PLUS_PLATFORM,
 	.gt = 3,
 };
 
-static const struct intel_device_info intel_skylake_gt4_info = {
+static const struct intel_device_info skl_gt4_info = {
 	SKL_GT3_PLUS_PLATFORM,
 	.gt = 4,
 };
@@ -679,13 +679,13 @@ static const struct intel_device_info intel_skylake_gt4_info = {
 	GEN9_DEFAULT_PAGE_SIZES, \
 	GEN_DEFAULT_REGIONS
 
-static const struct intel_device_info intel_broxton_info = {
+static const struct intel_device_info bxt_info = {
 	GEN9_LP_FEATURES,
 	PLATFORM(INTEL_BROXTON),
 	.ddb_size = 512,
 };
 
-static const struct intel_device_info intel_geminilake_info = {
+static const struct intel_device_info glk_info = {
 	GEN9_LP_FEATURES,
 	PLATFORM(INTEL_GEMINILAKE),
 	.ddb_size = 1024,
@@ -696,17 +696,17 @@ static const struct intel_device_info intel_geminilake_info = {
 	GEN9_FEATURES, \
 	PLATFORM(INTEL_KABYLAKE)
 
-static const struct intel_device_info intel_kabylake_gt1_info = {
+static const struct intel_device_info kbl_gt1_info = {
 	KBL_PLATFORM,
 	.gt = 1,
 };
 
-static const struct intel_device_info intel_kabylake_gt2_info = {
+static const struct intel_device_info kbl_gt2_info = {
 	KBL_PLATFORM,
 	.gt = 2,
 };
 
-static const struct intel_device_info intel_kabylake_gt3_info = {
+static const struct intel_device_info kbl_gt3_info = {
 	KBL_PLATFORM,
 	.gt = 3,
 	.engine_mask =
@@ -717,17 +717,17 @@ static const struct intel_device_info intel_kabylake_gt3_info = {
 	GEN9_FEATURES, \
 	PLATFORM(INTEL_COFFEELAKE)
 
-static const struct intel_device_info intel_coffeelake_gt1_info = {
+static const struct intel_device_info cfl_gt1_info = {
 	CFL_PLATFORM,
 	.gt = 1,
 };
 
-static const struct intel_device_info intel_coffeelake_gt2_info = {
+static const struct intel_device_info cfl_gt2_info = {
 	CFL_PLATFORM,
 	.gt = 2,
 };
 
-static const struct intel_device_info intel_coffeelake_gt3_info = {
+static const struct intel_device_info cfl_gt3_info = {
 	CFL_PLATFORM,
 	.gt = 3,
 	.engine_mask =
@@ -742,7 +742,7 @@ static const struct intel_device_info intel_coffeelake_gt3_info = {
 	.has_coherent_ggtt = false, \
 	GLK_COLORS
 
-static const struct intel_device_info intel_cannonlake_info = {
+static const struct intel_device_info cnl_info = {
 	GEN10_FEATURES,
 	PLATFORM(INTEL_CANNONLAKE),
 	.gt = 2,
@@ -777,14 +777,14 @@ static const struct intel_device_info intel_cannonlake_info = {
 	.has_logical_ring_elsq = 1, \
 	.color = { .degamma_lut_size = 33, .gamma_lut_size = 262145 }
 
-static const struct intel_device_info intel_icelake_11_info = {
+static const struct intel_device_info icl_info = {
 	GEN11_FEATURES,
 	PLATFORM(INTEL_ICELAKE),
 	.engine_mask =
 		BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2),
 };
 
-static const struct intel_device_info intel_elkhartlake_info = {
+static const struct intel_device_info ehl_info = {
 	GEN11_FEATURES,
 	PLATFORM(INTEL_ELKHARTLAKE),
 	.require_force_probe = 1,
@@ -815,7 +815,7 @@ static const struct intel_device_info intel_elkhartlake_info = {
 	.has_global_mocs = 1, \
 	.display.has_dsb = 1
 
-static const struct intel_device_info intel_tigerlake_12_info = {
+static const struct intel_device_info tgl_info = {
 	GEN12_FEATURES,
 	PLATFORM(INTEL_TIGERLAKE),
 	.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D),
@@ -840,70 +840,70 @@ static const struct intel_device_info intel_tigerlake_12_info = {
  * PCI ID matches, otherwise we'll use the wrong info struct above.
  */
 static const struct pci_device_id pciidlist[] = {
-	INTEL_I830_IDS(&intel_i830_info),
-	INTEL_I845G_IDS(&intel_i845g_info),
-	INTEL_I85X_IDS(&intel_i85x_info),
-	INTEL_I865G_IDS(&intel_i865g_info),
-	INTEL_I915G_IDS(&intel_i915g_info),
-	INTEL_I915GM_IDS(&intel_i915gm_info),
-	INTEL_I945G_IDS(&intel_i945g_info),
-	INTEL_I945GM_IDS(&intel_i945gm_info),
-	INTEL_I965G_IDS(&intel_i965g_info),
-	INTEL_G33_IDS(&intel_g33_info),
-	INTEL_I965GM_IDS(&intel_i965gm_info),
-	INTEL_GM45_IDS(&intel_gm45_info),
-	INTEL_G45_IDS(&intel_g45_info),
-	INTEL_PINEVIEW_G_IDS(&intel_pineview_g_info),
-	INTEL_PINEVIEW_M_IDS(&intel_pineview_m_info),
-	INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),
-	INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),
-	INTEL_SNB_D_GT1_IDS(&intel_sandybridge_d_gt1_info),
-	INTEL_SNB_D_GT2_IDS(&intel_sandybridge_d_gt2_info),
-	INTEL_SNB_M_GT1_IDS(&intel_sandybridge_m_gt1_info),
-	INTEL_SNB_M_GT2_IDS(&intel_sandybridge_m_gt2_info),
-	INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */
-	INTEL_IVB_M_GT1_IDS(&intel_ivybridge_m_gt1_info),
-	INTEL_IVB_M_GT2_IDS(&intel_ivybridge_m_gt2_info),
-	INTEL_IVB_D_GT1_IDS(&intel_ivybridge_d_gt1_info),
-	INTEL_IVB_D_GT2_IDS(&intel_ivybridge_d_gt2_info),
-	INTEL_HSW_GT1_IDS(&intel_haswell_gt1_info),
-	INTEL_HSW_GT2_IDS(&intel_haswell_gt2_info),
-	INTEL_HSW_GT3_IDS(&intel_haswell_gt3_info),
-	INTEL_VLV_IDS(&intel_valleyview_info),
-	INTEL_BDW_GT1_IDS(&intel_broadwell_gt1_info),
-	INTEL_BDW_GT2_IDS(&intel_broadwell_gt2_info),
-	INTEL_BDW_GT3_IDS(&intel_broadwell_gt3_info),
-	INTEL_BDW_RSVD_IDS(&intel_broadwell_rsvd_info),
-	INTEL_CHV_IDS(&intel_cherryview_info),
-	INTEL_SKL_GT1_IDS(&intel_skylake_gt1_info),
-	INTEL_SKL_GT2_IDS(&intel_skylake_gt2_info),
-	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),
-	INTEL_SKL_GT4_IDS(&intel_skylake_gt4_info),
-	INTEL_BXT_IDS(&intel_broxton_info),
-	INTEL_GLK_IDS(&intel_geminilake_info),
-	INTEL_KBL_GT1_IDS(&intel_kabylake_gt1_info),
-	INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info),
-	INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
-	INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
-	INTEL_AML_KBL_GT2_IDS(&intel_kabylake_gt2_info),
-	INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info),
-	INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info),
-	INTEL_CFL_H_GT1_IDS(&intel_coffeelake_gt1_info),
-	INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
-	INTEL_CFL_U_GT2_IDS(&intel_coffeelake_gt2_info),
-	INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
-	INTEL_WHL_U_GT1_IDS(&intel_coffeelake_gt1_info),
-	INTEL_WHL_U_GT2_IDS(&intel_coffeelake_gt2_info),
-	INTEL_AML_CFL_GT2_IDS(&intel_coffeelake_gt2_info),
-	INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info),
-	INTEL_CML_GT1_IDS(&intel_coffeelake_gt1_info),
-	INTEL_CML_GT2_IDS(&intel_coffeelake_gt2_info),
-	INTEL_CML_U_GT1_IDS(&intel_coffeelake_gt1_info),
-	INTEL_CML_U_GT2_IDS(&intel_coffeelake_gt2_info),
-	INTEL_CNL_IDS(&intel_cannonlake_info),
-	INTEL_ICL_11_IDS(&intel_icelake_11_info),
-	INTEL_EHL_IDS(&intel_elkhartlake_info),
-	INTEL_TGL_12_IDS(&intel_tigerlake_12_info),
+	INTEL_I830_IDS(&i830_info),
+	INTEL_I845G_IDS(&i845g_info),
+	INTEL_I85X_IDS(&i85x_info),
+	INTEL_I865G_IDS(&i865g_info),
+	INTEL_I915G_IDS(&i915g_info),
+	INTEL_I915GM_IDS(&i915gm_info),
+	INTEL_I945G_IDS(&i945g_info),
+	INTEL_I945GM_IDS(&i945gm_info),
+	INTEL_I965G_IDS(&i965g_info),
+	INTEL_G33_IDS(&g33_info),
+	INTEL_I965GM_IDS(&i965gm_info),
+	INTEL_GM45_IDS(&gm45_info),
+	INTEL_G45_IDS(&g45_info),
+	INTEL_PINEVIEW_G_IDS(&pnv_g_info),
+	INTEL_PINEVIEW_M_IDS(&pnv_m_info),
+	INTEL_IRONLAKE_D_IDS(&ilk_d_info),
+	INTEL_IRONLAKE_M_IDS(&ilk_m_info),
+	INTEL_SNB_D_GT1_IDS(&snb_d_gt1_info),
+	INTEL_SNB_D_GT2_IDS(&snb_d_gt2_info),
+	INTEL_SNB_M_GT1_IDS(&snb_m_gt1_info),
+	INTEL_SNB_M_GT2_IDS(&snb_m_gt2_info),
+	INTEL_IVB_Q_IDS(&ivb_q_info), /* must be first IVB */
+	INTEL_IVB_M_GT1_IDS(&ivb_m_gt1_info),
+	INTEL_IVB_M_GT2_IDS(&ivb_m_gt2_info),
+	INTEL_IVB_D_GT1_IDS(&ivb_d_gt1_info),
+	INTEL_IVB_D_GT2_IDS(&ivb_d_gt2_info),
+	INTEL_HSW_GT1_IDS(&hsw_gt1_info),
+	INTEL_HSW_GT2_IDS(&hsw_gt2_info),
+	INTEL_HSW_GT3_IDS(&hsw_gt3_info),
+	INTEL_VLV_IDS(&vlv_info),
+	INTEL_BDW_GT1_IDS(&bdw_gt1_info),
+	INTEL_BDW_GT2_IDS(&bdw_gt2_info),
+	INTEL_BDW_GT3_IDS(&bdw_gt3_info),
+	INTEL_BDW_RSVD_IDS(&bdw_rsvd_info),
+	INTEL_CHV_IDS(&chv_info),
+	INTEL_SKL_GT1_IDS(&skl_gt1_info),
+	INTEL_SKL_GT2_IDS(&skl_gt2_info),
+	INTEL_SKL_GT3_IDS(&skl_gt3_info),
+	INTEL_SKL_GT4_IDS(&skl_gt4_info),
+	INTEL_BXT_IDS(&bxt_info),
+	INTEL_GLK_IDS(&glk_info),
+	INTEL_KBL_GT1_IDS(&kbl_gt1_info),
+	INTEL_KBL_GT2_IDS(&kbl_gt2_info),
+	INTEL_KBL_GT3_IDS(&kbl_gt3_info),
+	INTEL_KBL_GT4_IDS(&kbl_gt3_info),
+	INTEL_AML_KBL_GT2_IDS(&kbl_gt2_info),
+	INTEL_CFL_S_GT1_IDS(&cfl_gt1_info),
+	INTEL_CFL_S_GT2_IDS(&cfl_gt2_info),
+	INTEL_CFL_H_GT1_IDS(&cfl_gt1_info),
+	INTEL_CFL_H_GT2_IDS(&cfl_gt2_info),
+	INTEL_CFL_U_GT2_IDS(&cfl_gt2_info),
+	INTEL_CFL_U_GT3_IDS(&cfl_gt3_info),
+	INTEL_WHL_U_GT1_IDS(&cfl_gt1_info),
+	INTEL_WHL_U_GT2_IDS(&cfl_gt2_info),
+	INTEL_AML_CFL_GT2_IDS(&cfl_gt2_info),
+	INTEL_WHL_U_GT3_IDS(&cfl_gt3_info),
+	INTEL_CML_GT1_IDS(&cfl_gt1_info),
+	INTEL_CML_GT2_IDS(&cfl_gt2_info),
+	INTEL_CML_U_GT1_IDS(&cfl_gt1_info),
+	INTEL_CML_U_GT2_IDS(&cfl_gt2_info),
+	INTEL_CNL_IDS(&cnl_info),
+	INTEL_ICL_11_IDS(&icl_info),
+	INTEL_EHL_IDS(&ehl_info),
+	INTEL_TGL_12_IDS(&tgl_info),
 	{0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v3 02/10] drm/i915: prefer 3-letter acronym for pineview

[Lucas De Marchi]

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 pineview to pnv 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>
---
 drivers/gpu/drm/i915/display/intel_display.c | 8 ++++----
 drivers/gpu/drm/i915/intel_pm.c              | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 1860da0a493e..5d43024f35aa 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -369,7 +369,7 @@ static const struct intel_limit intel_limits_g4x_dual_channel_lvds = {
 	},
 };
 
-static const struct intel_limit intel_limits_pineview_sdvo = {
+static const struct intel_limit pnv_limits_sdvo = {
 	.dot = { .min = 20000, .max = 400000},
 	.vco = { .min = 1700000, .max = 3500000 },
 	/* Pineview's Ncounter is a ring counter */
@@ -384,7 +384,7 @@ static const struct intel_limit intel_limits_pineview_sdvo = {
 		.p2_slow = 10, .p2_fast = 5 },
 };
 
-static const struct intel_limit intel_limits_pineview_lvds = {
+static const struct intel_limit pnv_limits_lvds = {
 	.dot = { .min = 20000, .max = 400000 },
 	.vco = { .min = 1700000, .max = 3500000 },
 	.n = { .min = 3, .max = 6 },
@@ -8795,9 +8795,9 @@ static int pnv_crtc_compute_clock(struct intel_crtc *crtc,
 			DRM_DEBUG_KMS("using SSC reference clock of %d kHz\n", refclk);
 		}
 
-		limit = &intel_limits_pineview_lvds;
+		limit = &pnv_limits_lvds;
 	} else {
-		limit = &intel_limits_pineview_sdvo;
+		limit = &pnv_limits_sdvo;
 	}
 
 	if (!crtc_state->clock_set &&
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 31ec82337e4f..eab3b029e98a 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -140,7 +140,7 @@ static void glk_init_clock_gating(struct drm_i915_private *dev_priv)
 
 }
 
-static void i915_pineview_get_mem_freq(struct drm_i915_private *dev_priv)
+static void pnv_get_mem_freq(struct drm_i915_private *dev_priv)
 {
 	u32 tmp;
 
@@ -7180,7 +7180,7 @@ void intel_init_pm(struct drm_i915_private *dev_priv)
 {
 	/* For cxsr */
 	if (IS_PINEVIEW(dev_priv))
-		i915_pineview_get_mem_freq(dev_priv);
+		pnv_get_mem_freq(dev_priv);
 	else if (IS_GEN(dev_priv, 5))
 		i915_ironlake_get_mem_freq(dev_priv);
 
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v3 03/10] drm/i915: prefer 3-letter acronym for haswell

[Lucas De Marchi]

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 haswell to hsw 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>
---
 drivers/gpu/drm/i915/display/intel_ddi.c     |  4 +-
 drivers/gpu/drm/i915/display/intel_display.c | 57 ++++++++++----------
 drivers/gpu/drm/i915/intel_device_info.c     |  4 +-
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index c9ba7d7f3787..d687c9503025 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3458,14 +3458,14 @@ static void tgl_ddi_pre_enable_dp(struct intel_encoder *encoder,
 	 * (DFLEXDPSP.DPX4TXLATC)
 	 *
 	 * This was done before tgl_ddi_pre_enable_dp by
-	 * haswell_crtc_enable()->intel_encoders_pre_pll_enable().
+	 * hsw_crtc_enable()->intel_encoders_pre_pll_enable().
 	 */
 
 	/*
 	 * 4. Enable the port PLL.
 	 *
 	 * The PLL enabling itself was already done before this function by
-	 * haswell_crtc_enable()->intel_enable_shared_dpll().  We need only
+	 * hsw_crtc_enable()->intel_enable_shared_dpll().  We need only
 	 * configure the PLL to port mapping here.
 	 */
 	intel_ddi_clk_select(encoder, crtc_state);
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 5d43024f35aa..14726a293171 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -158,7 +158,7 @@ static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_sta
 					 const struct intel_link_m_n *m2_n2);
 static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state);
 static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state);
-static void haswell_set_pipeconf(const struct intel_crtc_state *crtc_state);
+static void hsw_set_pipeconf(const struct intel_crtc_state *crtc_state);
 static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state);
 static void vlv_prepare_pll(struct intel_crtc *crtc,
 			    const struct intel_crtc_state *pipe_config);
@@ -6787,8 +6787,8 @@ static void hsw_set_frame_start_delay(const struct intel_crtc_state *crtc_state)
 	I915_WRITE(reg, val);
 }
 
-static void haswell_crtc_enable(struct intel_atomic_state *state,
-				struct intel_crtc *crtc)
+static void hsw_crtc_enable(struct intel_atomic_state *state,
+			    struct intel_crtc *crtc)
 {
 	const struct intel_crtc_state *new_crtc_state =
 		intel_atomic_get_new_crtc_state(state, crtc);
@@ -6829,7 +6829,7 @@ static void haswell_crtc_enable(struct intel_atomic_state *state,
 
 	if (!transcoder_is_dsi(cpu_transcoder)) {
 		hsw_set_frame_start_delay(new_crtc_state);
-		haswell_set_pipeconf(new_crtc_state);
+		hsw_set_pipeconf(new_crtc_state);
 	}
 
 	if (INTEL_GEN(dev_priv) >= 9 || IS_BROADWELL(dev_priv))
@@ -6967,8 +6967,8 @@ static void ironlake_crtc_disable(struct intel_atomic_state *state,
 	intel_set_pch_fifo_underrun_reporting(dev_priv, pipe, true);
 }
 
-static void haswell_crtc_disable(struct intel_atomic_state *state,
-				 struct intel_crtc *crtc)
+static void hsw_crtc_disable(struct intel_atomic_state *state,
+			     struct intel_crtc *crtc)
 {
 	/*
 	 * FIXME collapse everything to one hook.
@@ -9783,7 +9783,7 @@ static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state)
 	POSTING_READ(PIPECONF(pipe));
 }
 
-static void haswell_set_pipeconf(const struct intel_crtc_state *crtc_state)
+static void hsw_set_pipeconf(const struct intel_crtc_state *crtc_state)
 {
 	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -10417,8 +10417,9 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
 
 	return ret;
 }
-static int haswell_crtc_compute_clock(struct intel_crtc *crtc,
-				      struct intel_crtc_state *crtc_state)
+
+static int hsw_crtc_compute_clock(struct intel_crtc *crtc,
+				  struct intel_crtc_state *crtc_state)
 {
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 	struct intel_atomic_state *state =
@@ -10532,9 +10533,8 @@ static void skylake_get_ddi_pll(struct drm_i915_private *dev_priv,
 	pipe_config->shared_dpll = intel_get_shared_dpll_by_id(dev_priv, id);
 }
 
-static void haswell_get_ddi_pll(struct drm_i915_private *dev_priv,
-				enum port port,
-				struct intel_crtc_state *pipe_config)
+static void hsw_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
+			    struct intel_crtc_state *pipe_config)
 {
 	enum intel_dpll_id id;
 	u32 ddi_pll_sel = I915_READ(PORT_CLK_SEL(port));
@@ -10722,8 +10722,8 @@ static bool bxt_get_dsi_transcoder_state(struct intel_crtc *crtc,
 	return transcoder_is_dsi(pipe_config->cpu_transcoder);
 }
 
-static void haswell_get_ddi_port_state(struct intel_crtc *crtc,
-				       struct intel_crtc_state *pipe_config)
+static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
+				   struct intel_crtc_state *pipe_config)
 {
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 	enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
@@ -10751,7 +10751,7 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc,
 	else if (IS_GEN9_LP(dev_priv))
 		bxt_get_ddi_pll(dev_priv, port, pipe_config);
 	else
-		haswell_get_ddi_pll(dev_priv, port, pipe_config);
+		hsw_get_ddi_pll(dev_priv, port, pipe_config);
 
 	pll = pipe_config->shared_dpll;
 	if (pll) {
@@ -10829,8 +10829,8 @@ static void icelake_get_trans_port_sync_config(struct intel_crtc_state *crtc_sta
 		crtc_state->sync_mode_slaves_mask);
 }
 
-static bool haswell_get_pipe_config(struct intel_crtc *crtc,
-				    struct intel_crtc_state *pipe_config)
+static bool hsw_get_pipe_config(struct intel_crtc *crtc,
+				struct intel_crtc_state *pipe_config)
 {
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 	intel_wakeref_t wakerefs[POWER_DOMAIN_NUM], wf;
@@ -10865,7 +10865,7 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
 
 	if (!transcoder_is_dsi(pipe_config->cpu_transcoder) ||
 	    INTEL_GEN(dev_priv) >= 11) {
-		haswell_get_ddi_port_state(crtc, pipe_config);
+		hsw_get_ddi_port_state(crtc, pipe_config);
 		intel_get_pipe_timings(crtc, pipe_config);
 	}
 
@@ -14048,7 +14048,7 @@ static void intel_modeset_clear_plls(struct intel_atomic_state *state)
  * multiple pipes, and planes are enabled after the pipe, we need to wait at
  * least 2 vblanks on the first pipe before enabling planes on the second pipe.
  */
-static int haswell_mode_set_planes_workaround(struct intel_atomic_state *state)
+static int hsw_mode_set_planes_workaround(struct intel_atomic_state *state)
 {
 	struct intel_crtc_state *crtc_state;
 	struct intel_crtc *crtc;
@@ -14143,7 +14143,7 @@ static int intel_modeset_checks(struct intel_atomic_state *state)
 	intel_modeset_clear_plls(state);
 
 	if (IS_HASWELL(dev_priv))
-		return haswell_mode_set_planes_workaround(state);
+		return hsw_mode_set_planes_workaround(state);
 
 	return 0;
 }
@@ -16814,21 +16814,20 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
 	intel_init_cdclk_hooks(dev_priv);
 
 	if (INTEL_GEN(dev_priv) >= 9) {
-		dev_priv->display.get_pipe_config = haswell_get_pipe_config;
+		dev_priv->display.get_pipe_config = hsw_get_pipe_config;
 		dev_priv->display.get_initial_plane_config =
 			skylake_get_initial_plane_config;
-		dev_priv->display.crtc_compute_clock =
-			haswell_crtc_compute_clock;
-		dev_priv->display.crtc_enable = haswell_crtc_enable;
-		dev_priv->display.crtc_disable = haswell_crtc_disable;
+		dev_priv->display.crtc_compute_clock = hsw_crtc_compute_clock;
+		dev_priv->display.crtc_enable = hsw_crtc_enable;
+		dev_priv->display.crtc_disable = hsw_crtc_disable;
 	} else if (HAS_DDI(dev_priv)) {
-		dev_priv->display.get_pipe_config = haswell_get_pipe_config;
+		dev_priv->display.get_pipe_config = hsw_get_pipe_config;
 		dev_priv->display.get_initial_plane_config =
 			i9xx_get_initial_plane_config;
 		dev_priv->display.crtc_compute_clock =
-			haswell_crtc_compute_clock;
-		dev_priv->display.crtc_enable = haswell_crtc_enable;
-		dev_priv->display.crtc_disable = haswell_crtc_disable;
+			hsw_crtc_compute_clock;
+		dev_priv->display.crtc_enable = hsw_crtc_enable;
+		dev_priv->display.crtc_disable = hsw_crtc_disable;
 	} else if (HAS_PCH_SPLIT(dev_priv)) {
 		dev_priv->display.get_pipe_config = ironlake_get_pipe_config;
 		dev_priv->display.get_initial_plane_config =
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 1acb5db77431..ca7a42e1d769 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -600,7 +600,7 @@ static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv)
 	sseu->has_eu_pg = 0;
 }
 
-static void haswell_sseu_info_init(struct drm_i915_private *dev_priv)
+static void hsw_sseu_info_init(struct drm_i915_private *dev_priv)
 {
 	struct sseu_dev_info *sseu = &RUNTIME_INFO(dev_priv)->sseu;
 	u32 fuse1;
@@ -1021,7 +1021,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
 
 	/* Initialize slice/subslice/EU info */
 	if (IS_HASWELL(dev_priv))
-		haswell_sseu_info_init(dev_priv);
+		hsw_sseu_info_init(dev_priv);
 	else if (IS_CHERRYVIEW(dev_priv))
 		cherryview_sseu_info_init(dev_priv);
 	else if (IS_BROADWELL(dev_priv))
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v3 04/10] drm/i915: prefer 3-letter acronym for skylake

[Lucas De Marchi]

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: 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>
---
 drivers/gpu/drm/i915/display/icl_dsi.c       |  2 +-
 drivers/gpu/drm/i915/display/intel_ddi.c     |  2 +-
 drivers/gpu/drm/i915/display/intel_display.c | 29 ++++++++++----------
 drivers/gpu/drm/i915/display/intel_display.h |  2 +-
 drivers/gpu/drm/i915/display/intel_dp_mst.c  |  2 +-
 drivers/gpu/drm/i915/display/vlv_dsi.c       |  2 +-
 drivers/gpu/drm/i915/gt/intel_mocs.c         |  6 ++--
 7 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index 006b1a297e6f..8435bc5a7a74 100644
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -1259,7 +1259,7 @@ static void gen11_dsi_post_disable(struct intel_encoder *encoder,
 
 	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,
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index d687c9503025..b52c31721755 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3896,7 +3896,7 @@ static void intel_ddi_post_disable(struct intel_encoder *encoder,
 	intel_dsc_disable(old_crtc_state);
 
 	if (INTEL_GEN(dev_priv) >= 9)
-		skylake_scaler_disable(old_crtc_state);
+		skl_scaler_disable(old_crtc_state);
 	else
 		ironlake_pfit_disable(old_crtc_state);
 
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 14726a293171..18ac15df91c7 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -164,7 +164,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
 			    const struct intel_crtc_state *pipe_config);
 static void chv_prepare_pll(struct intel_crtc *crtc,
 			    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 intel_modeset_setup_hw_state(struct drm_device *dev,
 					 struct drm_modeset_acquire_ctx *ctx);
@@ -6001,7 +6001,7 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
 	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);
 	int i;
@@ -6010,7 +6010,7 @@ void skylake_scaler_disable(const struct intel_crtc_state *old_crtc_state)
 		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 drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -6844,7 +6844,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
 		glk_pipe_scaler_clock_gating_wa(dev_priv, pipe, true);
 
 	if (INTEL_GEN(dev_priv) >= 9)
-		skylake_pfit_enable(new_crtc_state);
+		skl_pfit_enable(new_crtc_state);
 	else
 		ironlake_pfit_enable(new_crtc_state);
 
@@ -10116,8 +10116,8 @@ static void ironlake_get_fdi_m_n_config(struct intel_crtc *crtc,
 				     &pipe_config->fdi_m_n, NULL);
 }
 
-static void skylake_get_pfit_config(struct intel_crtc *crtc,
-				    struct intel_crtc_state *pipe_config)
+static void skl_get_pfit_config(struct intel_crtc *crtc,
+				struct intel_crtc_state *pipe_config)
 {
 	struct drm_device *dev = crtc->base.dev;
 	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -10148,8 +10148,8 @@ static void skylake_get_pfit_config(struct intel_crtc *crtc,
 }
 
 static void
-skylake_get_initial_plane_config(struct intel_crtc *crtc,
-				 struct intel_initial_plane_config *plane_config)
+skl_get_initial_plane_config(struct intel_crtc *crtc,
+			     struct intel_initial_plane_config *plane_config)
 {
 	struct drm_device *dev = crtc->base.dev;
 	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -10517,9 +10517,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);
 }
 
-static void skylake_get_ddi_pll(struct drm_i915_private *dev_priv,
-				enum port port,
-				struct intel_crtc_state *pipe_config)
+static void skl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
+			    struct intel_crtc_state *pipe_config)
 {
 	enum intel_dpll_id id;
 	u32 temp;
@@ -10747,7 +10746,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
 	else if (IS_CANNONLAKE(dev_priv))
 		cannonlake_get_ddi_pll(dev_priv, port, pipe_config);
 	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))
 		bxt_get_ddi_pll(dev_priv, port, pipe_config);
 	else
@@ -10922,7 +10921,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
 		power_domain_mask |= BIT_ULL(power_domain);
 
 		if (INTEL_GEN(dev_priv) >= 9)
-			skylake_get_pfit_config(crtc, pipe_config);
+			skl_get_pfit_config(crtc, pipe_config);
 		else
 			ironlake_get_pfit_config(crtc, pipe_config);
 	}
@@ -14472,7 +14471,7 @@ static void intel_pipe_fastset(const struct intel_crtc_state *old_crtc_state,
 		skl_detach_scalers(new_crtc_state);
 
 		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)) {
 		if (new_crtc_state->pch_pfit.enabled)
 			ironlake_pfit_enable(new_crtc_state);
@@ -16816,7 +16815,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
 	if (INTEL_GEN(dev_priv) >= 9) {
 		dev_priv->display.get_pipe_config = hsw_get_pipe_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_enable = hsw_crtc_enable;
 		dev_priv->display.crtc_disable = hsw_crtc_disable;
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 0fef9263cddc..921a584c3284 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -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);
 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);
 u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
 			const struct intel_plane_state *plane_state);
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 7aa0975c33b7..01b4608ab56c 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -248,7 +248,7 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,
 	intel_ddi_disable_transcoder_func(old_crtc_state);
 
 	if (INTEL_GEN(dev_priv) >= 9)
-		skylake_scaler_disable(old_crtc_state);
+		skl_scaler_disable(old_crtc_state);
 	else
 		ironlake_pfit_disable(old_crtc_state);
 
diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
index 21e820299107..70ab378803c4 100644
--- a/drivers/gpu/drm/i915/display/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
@@ -895,7 +895,7 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder,
 	if (IS_GEN9_LP(dev_priv)) {
 		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)) {
diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
index 893249ea48d4..cbdeda608359 100644
--- a/drivers/gpu/drm/i915/gt/intel_mocs.c
+++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
@@ -127,7 +127,7 @@ struct drm_i915_mocs_table {
 		   LE_0_PAGETABLE | LE_TC_2_LLC_ELLC | LE_LRUM(3), \
 		   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,
 	MOCS_ENTRY(I915_MOCS_CACHED,
 		   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,
 		table->table = icelake_mocs_table;
 		table->n_entries = GEN11_NUM_MOCS_ENTRIES;
 	} 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->table = skylake_mocs_table;
+		table->table = skl_mocs_table;
 	} else if (IS_GEN9_LP(i915)) {
 		table->size  = ARRAY_SIZE(broxton_mocs_table);
 		table->n_entries = GEN9_NUM_MOCS_ENTRIES;
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v3 05/10] drm/i915: prefer 3-letter acronym for cannonlake

[Lucas De Marchi]

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 cannonlake to cnl 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>
---
 drivers/gpu/drm/i915/display/intel_display.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 18ac15df91c7..98d6bcb4c761 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -10440,9 +10440,8 @@ static int hsw_crtc_compute_clock(struct intel_crtc *crtc,
 	return 0;
 }
 
-static void cannonlake_get_ddi_pll(struct drm_i915_private *dev_priv,
-				   enum port port,
-				   struct intel_crtc_state *pipe_config)
+static void cnl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
+			    struct intel_crtc_state *pipe_config)
 {
 	enum intel_dpll_id id;
 	u32 temp;
@@ -10744,7 +10743,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
 	if (INTEL_GEN(dev_priv) >= 11)
 		icelake_get_ddi_pll(dev_priv, port, pipe_config);
 	else if (IS_CANNONLAKE(dev_priv))
-		cannonlake_get_ddi_pll(dev_priv, port, pipe_config);
+		cnl_get_ddi_pll(dev_priv, port, pipe_config);
 	else if (IS_GEN9_BC(dev_priv))
 		skl_get_ddi_pll(dev_priv, port, pipe_config);
 	else if (IS_GEN9_LP(dev_priv))
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v3 06/10] drm/i915: prefer 3-letter acronym for icelake

[Lucas De Marchi]

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 icelake to icl 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>
---
 drivers/gpu/drm/i915/display/intel_display.c | 11 +++++------
 drivers/gpu/drm/i915/gt/intel_mocs.c         |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 98d6bcb4c761..461691cc2f62 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -10455,9 +10455,8 @@ static void cnl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
 	pipe_config->shared_dpll = intel_get_shared_dpll_by_id(dev_priv, id);
 }
 
-static void icelake_get_ddi_pll(struct drm_i915_private *dev_priv,
-				enum port port,
-				struct intel_crtc_state *pipe_config)
+static void icl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
+			    struct intel_crtc_state *pipe_config)
 {
 	enum phy phy = intel_port_to_phy(dev_priv, port);
 	enum icl_port_dpll_id port_dpll_id;
@@ -10741,7 +10740,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
 	}
 
 	if (INTEL_GEN(dev_priv) >= 11)
-		icelake_get_ddi_pll(dev_priv, port, pipe_config);
+		icl_get_ddi_pll(dev_priv, port, pipe_config);
 	else if (IS_CANNONLAKE(dev_priv))
 		cnl_get_ddi_pll(dev_priv, port, pipe_config);
 	else if (IS_GEN9_BC(dev_priv))
@@ -10792,7 +10791,7 @@ static enum transcoder transcoder_master_readout(struct drm_i915_private *dev_pr
 		return master_select - 1;
 }
 
-static void icelake_get_trans_port_sync_config(struct intel_crtc_state *crtc_state)
+static void icl_get_trans_port_sync_config(struct intel_crtc_state *crtc_state)
 {
 	struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
 	u32 transcoders;
@@ -10948,7 +10947,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
 
 	if (INTEL_GEN(dev_priv) >= 11 &&
 	    !transcoder_is_dsi(pipe_config->cpu_transcoder))
-		icelake_get_trans_port_sync_config(pipe_config);
+		icl_get_trans_port_sync_config(pipe_config);
 
 out:
 	for_each_power_domain(power_domain, power_domain_mask)
diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
index cbdeda608359..95f1bc45953b 100644
--- a/drivers/gpu/drm/i915/gt/intel_mocs.c
+++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
@@ -267,7 +267,7 @@ static const struct drm_i915_mocs_entry tigerlake_mocs_table[] = {
 		   L3_3_WB),
 };
 
-static const struct drm_i915_mocs_entry icelake_mocs_table[] = {
+static const struct drm_i915_mocs_entry icl_mocs_table[] = {
 	/* Base - Uncached (Deprecated) */
 	MOCS_ENTRY(I915_MOCS_UNCACHED,
 		   LE_1_UC | LE_TC_1_LLC,
@@ -288,8 +288,8 @@ static bool get_mocs_settings(const struct drm_i915_private *i915,
 		table->table = tigerlake_mocs_table;
 		table->n_entries = GEN11_NUM_MOCS_ENTRIES;
 	} else if (IS_GEN(i915, 11)) {
-		table->size  = ARRAY_SIZE(icelake_mocs_table);
-		table->table = icelake_mocs_table;
+		table->size  = ARRAY_SIZE(icl_mocs_table);
+		table->table = icl_mocs_table;
 		table->n_entries = GEN11_NUM_MOCS_ENTRIES;
 	} else if (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915)) {
 		table->size  = ARRAY_SIZE(skl_mocs_table);
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v3 07/10] drm/i915: prefer 3-letter acronym for ironlake

[Lucas De Marchi]

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>
---
 drivers/gpu/drm/i915/display/intel_crt.c      |   8 +-
 drivers/gpu/drm/i915/display/intel_ddi.c      |   2 +-
 drivers/gpu/drm/i915/display/intel_display.c  | 168 +++++++++---------
 drivers/gpu/drm/i915/display/intel_display.h  |   4 +-
 drivers/gpu/drm/i915/display/intel_dp.c       |  34 ++--
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |   2 +-
 .../drm/i915/display/intel_fifo_underrun.c    |   6 +-
 drivers/gpu/drm/i915/gt/intel_reset.c         |   7 +-
 drivers/gpu/drm/i915/i915_debugfs.c           |   4 +-
 drivers/gpu/drm/i915/i915_irq.c               |  12 +-
 drivers/gpu/drm/i915/intel_pm.c               |   4 +-
 11 files changed, 125 insertions(+), 126 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index b2b1336ecdb6..cbe5978e7fb5 100644
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -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);
 
@@ -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 */
@@ -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);
@@ -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);
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index b52c31721755..62fa73815d8a 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3898,7 +3898,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:
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 461691cc2f62..5093fd08f381 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -145,8 +145,8 @@ static const u64 cursor_format_modifiers[] = {
 
 static void i9xx_crtc_clock_get(struct intel_crtc *crtc,
 				struct intel_crtc_state *pipe_config);
-static void ironlake_pch_clock_get(struct intel_crtc *crtc,
-				   struct intel_crtc_state *pipe_config);
+static void ilk_pch_clock_get(struct intel_crtc *crtc,
+			      struct intel_crtc_state *pipe_config);
 
 static int intel_framebuffer_init(struct intel_framebuffer *ifb,
 				  struct drm_i915_gem_object *obj,
@@ -157,7 +157,7 @@ static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_sta
 					 const struct intel_link_m_n *m_n,
 					 const struct intel_link_m_n *m2_n2);
 static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state);
-static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state);
+static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state);
 static void hsw_set_pipeconf(const struct intel_crtc_state *crtc_state);
 static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state);
 static void vlv_prepare_pll(struct intel_crtc *crtc,
@@ -165,7 +165,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
 static void chv_prepare_pll(struct intel_crtc *crtc,
 			    const struct intel_crtc_state *pipe_config);
 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 ilk_pfit_enable(const struct intel_crtc_state *crtc_state);
 static void intel_modeset_setup_hw_state(struct drm_device *dev,
 					 struct drm_modeset_acquire_ctx *ctx);
 static struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc);
@@ -402,7 +402,7 @@ static const struct intel_limit pnv_limits_lvds = {
  * We calculate clock using (register_value + 2) for N/M1/M2, so here
  * the range value for them is (actual_value - 2).
  */
-static const struct intel_limit intel_limits_ironlake_dac = {
+static const struct intel_limit ilk_limits_dac = {
 	.dot = { .min = 25000, .max = 350000 },
 	.vco = { .min = 1760000, .max = 3510000 },
 	.n = { .min = 1, .max = 5 },
@@ -415,7 +415,7 @@ static const struct intel_limit intel_limits_ironlake_dac = {
 		.p2_slow = 10, .p2_fast = 5 },
 };
 
-static const struct intel_limit intel_limits_ironlake_single_lvds = {
+static const struct intel_limit ilk_limits_single_lvds = {
 	.dot = { .min = 25000, .max = 350000 },
 	.vco = { .min = 1760000, .max = 3510000 },
 	.n = { .min = 1, .max = 3 },
@@ -428,7 +428,7 @@ static const struct intel_limit intel_limits_ironlake_single_lvds = {
 		.p2_slow = 14, .p2_fast = 14 },
 };
 
-static const struct intel_limit intel_limits_ironlake_dual_lvds = {
+static const struct intel_limit ilk_limits_dual_lvds = {
 	.dot = { .min = 25000, .max = 350000 },
 	.vco = { .min = 1760000, .max = 3510000 },
 	.n = { .min = 1, .max = 3 },
@@ -442,7 +442,7 @@ static const struct intel_limit intel_limits_ironlake_dual_lvds = {
 };
 
 /* LVDS 100mhz refclk limits. */
-static const struct intel_limit intel_limits_ironlake_single_lvds_100m = {
+static const struct intel_limit ilk_limits_single_lvds_100m = {
 	.dot = { .min = 25000, .max = 350000 },
 	.vco = { .min = 1760000, .max = 3510000 },
 	.n = { .min = 1, .max = 2 },
@@ -455,7 +455,7 @@ static const struct intel_limit intel_limits_ironlake_single_lvds_100m = {
 		.p2_slow = 14, .p2_fast = 14 },
 };
 
-static const struct intel_limit intel_limits_ironlake_dual_lvds_100m = {
+static const struct intel_limit ilk_limits_dual_lvds_100m = {
 	.dot = { .min = 25000, .max = 350000 },
 	.vco = { .min = 1760000, .max = 3510000 },
 	.n = { .min = 1, .max = 3 },
@@ -1637,7 +1637,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
 		     I915_READ(dpll_reg) & port_mask, expected_mask);
 }
 
-static void ironlake_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)
+static void ilk_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)
 {
 	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -1735,8 +1735,8 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv,
 		DRM_ERROR("Failed to enable PCH transcoder\n");
 }
 
-static void ironlake_disable_pch_transcoder(struct drm_i915_private *dev_priv,
-					    enum pipe pipe)
+static void ilk_disable_pch_transcoder(struct drm_i915_private *dev_priv,
+				       enum pipe pipe)
 {
 	i915_reg_t reg;
 	u32 val;
@@ -4869,8 +4869,8 @@ static void intel_fdi_normal_train(struct intel_crtc *crtc)
 }
 
 /* The FDI link training functions for ILK/Ibexpeak. */
-static void ironlake_fdi_link_train(struct intel_crtc *crtc,
-				    const struct intel_crtc_state *crtc_state)
+static void ilk_fdi_link_train(struct intel_crtc *crtc,
+			       const struct intel_crtc_state *crtc_state)
 {
 	struct drm_device *dev = crtc->base.dev;
 	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -5222,7 +5222,7 @@ static void ivb_manual_fdi_link_train(struct intel_crtc *crtc,
 	DRM_DEBUG_KMS("FDI train done.\n");
 }
 
-static void ironlake_fdi_pll_enable(const struct intel_crtc_state *crtc_state)
+static void ilk_fdi_pll_enable(const struct intel_crtc_state *crtc_state)
 {
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->uapi.crtc);
 	struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev);
@@ -5259,7 +5259,7 @@ static void ironlake_fdi_pll_enable(const struct intel_crtc_state *crtc_state)
 	}
 }
 
-static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc)
+static void ilk_fdi_pll_disable(struct intel_crtc *intel_crtc)
 {
 	struct drm_device *dev = intel_crtc->base.dev;
 	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -5289,7 +5289,7 @@ static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc)
 	udelay(100);
 }
 
-static void ironlake_fdi_disable(struct intel_crtc *crtc)
+static void ilk_fdi_disable(struct intel_crtc *crtc)
 {
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 	enum pipe pipe = crtc->pipe;
@@ -5496,8 +5496,8 @@ int lpt_get_iclkip(struct drm_i915_private *dev_priv)
 				 desired_divisor << auxdiv);
 }
 
-static void ironlake_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_state,
-						enum pipe pch_transcoder)
+static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_state,
+					   enum pipe pch_transcoder)
 {
 	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -5601,8 +5601,8 @@ intel_get_crtc_new_encoder(const struct intel_atomic_state *state,
  *   - DP transcoding bits
  *   - transcoder
  */
-static void ironlake_pch_enable(const struct intel_atomic_state *state,
-				const struct intel_crtc_state *crtc_state)
+static void ilk_pch_enable(const struct intel_atomic_state *state,
+			   const struct intel_crtc_state *crtc_state)
 {
 	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
 	struct drm_device *dev = crtc->base.dev;
@@ -5650,7 +5650,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,
 
 	/* set transcoder timing, panel must allow it */
 	assert_panel_unlocked(dev_priv, pipe);
-	ironlake_pch_transcoder_set_timings(crtc_state, pipe);
+	ilk_pch_transcoder_set_timings(crtc_state, pipe);
 
 	intel_fdi_normal_train(crtc);
 
@@ -5682,7 +5682,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,
 		I915_WRITE(reg, temp);
 	}
 
-	ironlake_enable_pch_transcoder(crtc_state);
+	ilk_enable_pch_transcoder(crtc_state);
 }
 
 static void lpt_pch_enable(const struct intel_atomic_state *state,
@@ -5697,7 +5697,7 @@ static void lpt_pch_enable(const struct intel_atomic_state *state,
 	lpt_program_iclkip(crtc_state);
 
 	/* Set transcoder timing. */
-	ironlake_pch_transcoder_set_timings(crtc_state, PIPE_A);
+	ilk_pch_transcoder_set_timings(crtc_state, PIPE_A);
 
 	lpt_enable_pch_transcoder(dev_priv, cpu_transcoder);
 }
@@ -6047,7 +6047,7 @@ 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 ilk_pfit_enable(const struct intel_crtc_state *crtc_state)
 {
 	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -6643,8 +6643,8 @@ static void intel_disable_primary_plane(const struct intel_crtc_state *crtc_stat
 	plane->disable_plane(plane, crtc_state);
 }
 
-static void ironlake_crtc_enable(struct intel_atomic_state *state,
-				 struct intel_crtc *crtc)
+static void ilk_crtc_enable(struct intel_atomic_state *state,
+			    struct intel_crtc *crtc)
 {
 	const struct intel_crtc_state *new_crtc_state =
 		intel_atomic_get_new_crtc_state(state, crtc);
@@ -6680,7 +6680,7 @@ static void ironlake_crtc_enable(struct intel_atomic_state *state,
 		intel_cpu_transcoder_set_m_n(new_crtc_state,
 					     &new_crtc_state->fdi_m_n, NULL);
 
-	ironlake_set_pipeconf(new_crtc_state);
+	ilk_set_pipeconf(new_crtc_state);
 
 	crtc->active = true;
 
@@ -6690,13 +6690,13 @@ static void ironlake_crtc_enable(struct intel_atomic_state *state,
 		/* Note: FDI PLL enabling _must_ be done before we enable the
 		 * cpu pipes, hence this is separate from all the other fdi/pch
 		 * enabling. */
-		ironlake_fdi_pll_enable(new_crtc_state);
+		ilk_fdi_pll_enable(new_crtc_state);
 	} else {
 		assert_fdi_tx_disabled(dev_priv, pipe);
 		assert_fdi_rx_disabled(dev_priv, pipe);
 	}
 
-	ironlake_pfit_enable(new_crtc_state);
+	ilk_pfit_enable(new_crtc_state);
 
 	/*
 	 * On ILK+ LUT must be loaded before the pipe is running but with
@@ -6712,7 +6712,7 @@ static void ironlake_crtc_enable(struct intel_atomic_state *state,
 	intel_enable_pipe(new_crtc_state);
 
 	if (new_crtc_state->has_pch_encoder)
-		ironlake_pch_enable(state, new_crtc_state);
+		ilk_pch_enable(state, new_crtc_state);
 
 	intel_crtc_vblank_on(new_crtc_state);
 
@@ -6846,7 +6846,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
 	if (INTEL_GEN(dev_priv) >= 9)
 		skl_pfit_enable(new_crtc_state);
 	else
-		ironlake_pfit_enable(new_crtc_state);
+		ilk_pfit_enable(new_crtc_state);
 
 	/*
 	 * On ILK+ LUT must be loaded before the pipe is running but with
@@ -6895,7 +6895,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
 	}
 }
 
-void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state)
+void ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state)
 {
 	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -6910,8 +6910,8 @@ void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state)
 	}
 }
 
-static void ironlake_crtc_disable(struct intel_atomic_state *state,
-				  struct intel_crtc *crtc)
+static void ilk_crtc_disable(struct intel_atomic_state *state,
+			     struct intel_crtc *crtc)
 {
 	const struct intel_crtc_state *old_crtc_state =
 		intel_atomic_get_old_crtc_state(state, crtc);
@@ -6932,15 +6932,15 @@ static void ironlake_crtc_disable(struct intel_atomic_state *state,
 
 	intel_disable_pipe(old_crtc_state);
 
-	ironlake_pfit_disable(old_crtc_state);
+	ilk_pfit_disable(old_crtc_state);
 
 	if (old_crtc_state->has_pch_encoder)
-		ironlake_fdi_disable(crtc);
+		ilk_fdi_disable(crtc);
 
 	intel_encoders_post_disable(state, crtc);
 
 	if (old_crtc_state->has_pch_encoder) {
-		ironlake_disable_pch_transcoder(dev_priv, pipe);
+		ilk_disable_pch_transcoder(dev_priv, pipe);
 
 		if (HAS_PCH_CPT(dev_priv)) {
 			i915_reg_t reg;
@@ -6960,7 +6960,7 @@ static void ironlake_crtc_disable(struct intel_atomic_state *state,
 			I915_WRITE(PCH_DPLL_SEL, temp);
 		}
 
-		ironlake_fdi_pll_disable(crtc);
+		ilk_fdi_pll_disable(crtc);
 	}
 
 	intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, true);
@@ -7505,8 +7505,8 @@ static int pipe_required_fdi_lanes(struct intel_crtc_state *crtc_state)
 	return 0;
 }
 
-static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
-				     struct intel_crtc_state *pipe_config)
+static int ilk_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
+			       struct intel_crtc_state *pipe_config)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	struct drm_atomic_state *state = pipe_config->uapi.state;
@@ -7578,8 +7578,8 @@ static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
 }
 
 #define RETRY 1
-static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc,
-				       struct intel_crtc_state *pipe_config)
+static int ilk_fdi_compute_config(struct intel_crtc *intel_crtc,
+				  struct intel_crtc_state *pipe_config)
 {
 	struct drm_device *dev = intel_crtc->base.dev;
 	const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;
@@ -7598,15 +7598,15 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc,
 
 	fdi_dotclock = adjusted_mode->crtc_clock;
 
-	lane = ironlake_get_lanes_required(fdi_dotclock, link_bw,
-					   pipe_config->pipe_bpp);
+	lane = ilk_get_lanes_required(fdi_dotclock, link_bw,
+				      pipe_config->pipe_bpp);
 
 	pipe_config->fdi_lanes = lane;
 
 	intel_link_compute_m_n(pipe_config->pipe_bpp, lane, fdi_dotclock,
 			       link_bw, &pipe_config->fdi_m_n, false, false);
 
-	ret = ironlake_check_fdi_lanes(dev, intel_crtc->pipe, pipe_config);
+	ret = ilk_check_fdi_lanes(dev, intel_crtc->pipe, pipe_config);
 	if (ret == -EDEADLK)
 		return ret;
 
@@ -7812,7 +7812,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
 	intel_crtc_compute_pixel_rate(pipe_config);
 
 	if (pipe_config->has_pch_encoder)
-		return ironlake_fdi_compute_config(crtc, pipe_config);
+		return ilk_fdi_compute_config(crtc, pipe_config);
 
 	return 0;
 }
@@ -9224,7 +9224,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
 	return ret;
 }
 
-static void ironlake_init_pch_refclk(struct drm_i915_private *dev_priv)
+static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv)
 {
 	struct intel_encoder *encoder;
 	int i;
@@ -9722,12 +9722,12 @@ static void lpt_init_pch_refclk(struct drm_i915_private *dev_priv)
 void intel_init_pch_refclk(struct drm_i915_private *dev_priv)
 {
 	if (HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv))
-		ironlake_init_pch_refclk(dev_priv);
+		ilk_init_pch_refclk(dev_priv);
 	else if (HAS_PCH_LPT(dev_priv))
 		lpt_init_pch_refclk(dev_priv);
 }
 
-static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state)
+static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state)
 {
 	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -9871,7 +9871,7 @@ int bdw_get_pipemisc_bpp(struct intel_crtc *crtc)
 	}
 }
 
-int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp)
+int ilk_get_lanes_required(int target_clock, int link_bw, int bpp)
 {
 	/*
 	 * Account for spread spectrum to avoid
@@ -9882,14 +9882,14 @@ int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp)
 	return DIV_ROUND_UP(bps, link_bw * 8);
 }
 
-static bool ironlake_needs_fb_cb_tune(struct dpll *dpll, int factor)
+static bool ilk_needs_fb_cb_tune(struct dpll *dpll, int factor)
 {
 	return i9xx_dpll_compute_m(dpll) < factor * dpll->n;
 }
 
-static void ironlake_compute_dpll(struct intel_crtc *crtc,
-				  struct intel_crtc_state *crtc_state,
-				  struct dpll *reduced_clock)
+static void ilk_compute_dpll(struct intel_crtc *crtc,
+			     struct intel_crtc_state *crtc_state,
+			     struct dpll *reduced_clock)
 {
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 	u32 dpll, fp, fp2;
@@ -9909,7 +9909,7 @@ static void ironlake_compute_dpll(struct intel_crtc *crtc,
 
 	fp = i9xx_dpll_compute_fp(&crtc_state->dpll);
 
-	if (ironlake_needs_fb_cb_tune(&crtc_state->dpll, factor))
+	if (ilk_needs_fb_cb_tune(&crtc_state->dpll, factor))
 		fp |= FP_CB_TUNE;
 
 	if (reduced_clock) {
@@ -9989,8 +9989,8 @@ static void ironlake_compute_dpll(struct intel_crtc *crtc,
 	crtc_state->dpll_hw_state.fp1 = fp2;
 }
 
-static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
-				       struct intel_crtc_state *crtc_state)
+static int ilk_crtc_compute_clock(struct intel_crtc *crtc,
+				  struct intel_crtc_state *crtc_state)
 {
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 	struct intel_atomic_state *state =
@@ -10014,17 +10014,17 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
 
 		if (intel_is_dual_link_lvds(dev_priv)) {
 			if (refclk == 100000)
-				limit = &intel_limits_ironlake_dual_lvds_100m;
+				limit = &ilk_limits_dual_lvds_100m;
 			else
-				limit = &intel_limits_ironlake_dual_lvds;
+				limit = &ilk_limits_dual_lvds;
 		} else {
 			if (refclk == 100000)
-				limit = &intel_limits_ironlake_single_lvds_100m;
+				limit = &ilk_limits_single_lvds_100m;
 			else
-				limit = &intel_limits_ironlake_single_lvds;
+				limit = &ilk_limits_single_lvds;
 		}
 	} else {
-		limit = &intel_limits_ironlake_dac;
+		limit = &ilk_limits_dac;
 	}
 
 	if (!crtc_state->clock_set &&
@@ -10034,7 +10034,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
 		return -EINVAL;
 	}
 
-	ironlake_compute_dpll(crtc, crtc_state, NULL);
+	ilk_compute_dpll(crtc, crtc_state, NULL);
 
 	if (!intel_reserve_shared_dplls(state, crtc, NULL)) {
 		DRM_DEBUG_KMS("failed to find PLL for pipe %c\n",
@@ -10109,8 +10109,8 @@ void intel_dp_get_m_n(struct intel_crtc *crtc,
 					     &pipe_config->dp_m2_n2);
 }
 
-static void ironlake_get_fdi_m_n_config(struct intel_crtc *crtc,
-					struct intel_crtc_state *pipe_config)
+static void ilk_get_fdi_m_n_config(struct intel_crtc *crtc,
+				   struct intel_crtc_state *pipe_config)
 {
 	intel_cpu_transcoder_get_m_n(crtc, pipe_config->cpu_transcoder,
 				     &pipe_config->fdi_m_n, NULL);
@@ -10276,8 +10276,8 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
 	kfree(intel_fb);
 }
 
-static void ironlake_get_pfit_config(struct intel_crtc *crtc,
-				     struct intel_crtc_state *pipe_config)
+static void ilk_get_pfit_config(struct intel_crtc *crtc,
+				struct intel_crtc_state *pipe_config)
 {
 	struct drm_device *dev = crtc->base.dev;
 	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -10300,8 +10300,8 @@ static void ironlake_get_pfit_config(struct intel_crtc *crtc,
 	}
 }
 
-static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
-				     struct intel_crtc_state *pipe_config)
+static bool ilk_get_pipe_config(struct intel_crtc *crtc,
+				struct intel_crtc_state *pipe_config)
 {
 	struct drm_device *dev = crtc->base.dev;
 	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -10372,7 +10372,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
 		pipe_config->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>
 					  FDI_DP_PORT_WIDTH_SHIFT) + 1;
 
-		ironlake_get_fdi_m_n_config(crtc, pipe_config);
+		ilk_get_fdi_m_n_config(crtc, pipe_config);
 
 		if (HAS_PCH_IBX(dev_priv)) {
 			/*
@@ -10400,7 +10400,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
 			((tmp & PLL_REF_SDVO_HDMI_MULTIPLIER_MASK)
 			 >> PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT) + 1;
 
-		ironlake_pch_clock_get(crtc, pipe_config);
+		ilk_pch_clock_get(crtc, pipe_config);
 	} else {
 		pipe_config->pixel_multiplier = 1;
 	}
@@ -10408,7 +10408,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
 	intel_get_pipe_timings(crtc, pipe_config);
 	intel_get_pipe_src_size(crtc, pipe_config);
 
-	ironlake_get_pfit_config(crtc, pipe_config);
+	ilk_get_pfit_config(crtc, pipe_config);
 
 	ret = true;
 
@@ -10769,7 +10769,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
 		pipe_config->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>
 					  FDI_DP_PORT_WIDTH_SHIFT) + 1;
 
-		ironlake_get_fdi_m_n_config(crtc, pipe_config);
+		ilk_get_fdi_m_n_config(crtc, pipe_config);
 	}
 }
 
@@ -10921,7 +10921,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
 		if (INTEL_GEN(dev_priv) >= 9)
 			skl_get_pfit_config(crtc, pipe_config);
 		else
-			ironlake_get_pfit_config(crtc, pipe_config);
+			ilk_get_pfit_config(crtc, pipe_config);
 	}
 
 	if (hsw_crtc_supports_ips(crtc)) {
@@ -11864,8 +11864,8 @@ int intel_dotclock_calculate(int link_freq,
 	return div_u64(mul_u32_u32(m_n->link_m, link_freq), m_n->link_n);
 }
 
-static void ironlake_pch_clock_get(struct intel_crtc *crtc,
-				   struct intel_crtc_state *pipe_config)
+static void ilk_pch_clock_get(struct intel_crtc *crtc,
+			      struct intel_crtc_state *pipe_config)
 {
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 
@@ -14472,9 +14472,9 @@ static void intel_pipe_fastset(const struct intel_crtc_state *old_crtc_state,
 			skl_pfit_enable(new_crtc_state);
 	} else if (HAS_PCH_SPLIT(dev_priv)) {
 		if (new_crtc_state->pch_pfit.enabled)
-			ironlake_pfit_enable(new_crtc_state);
+			ilk_pfit_enable(new_crtc_state);
 		else if (old_crtc_state->pch_pfit.enabled)
-			ironlake_pfit_disable(old_crtc_state);
+			ilk_pfit_disable(old_crtc_state);
 	}
 
 	if (INTEL_GEN(dev_priv) >= 11)
@@ -16826,13 +16826,13 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
 		dev_priv->display.crtc_enable = hsw_crtc_enable;
 		dev_priv->display.crtc_disable = hsw_crtc_disable;
 	} else if (HAS_PCH_SPLIT(dev_priv)) {
-		dev_priv->display.get_pipe_config = ironlake_get_pipe_config;
+		dev_priv->display.get_pipe_config = ilk_get_pipe_config;
 		dev_priv->display.get_initial_plane_config =
 			i9xx_get_initial_plane_config;
 		dev_priv->display.crtc_compute_clock =
-			ironlake_crtc_compute_clock;
-		dev_priv->display.crtc_enable = ironlake_crtc_enable;
-		dev_priv->display.crtc_disable = ironlake_crtc_disable;
+			ilk_crtc_compute_clock;
+		dev_priv->display.crtc_enable = ilk_crtc_enable;
+		dev_priv->display.crtc_disable = ilk_crtc_disable;
 	} else if (IS_CHERRYVIEW(dev_priv)) {
 		dev_priv->display.get_pipe_config = i9xx_get_pipe_config;
 		dev_priv->display.get_initial_plane_config =
@@ -16878,7 +16878,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
 	}
 
 	if (IS_GEN(dev_priv, 5)) {
-		dev_priv->display.fdi_link_train = ironlake_fdi_link_train;
+		dev_priv->display.fdi_link_train = ilk_fdi_link_train;
 	} else if (IS_GEN(dev_priv, 6)) {
 		dev_priv->display.fdi_link_train = gen6_fdi_link_train;
 	} else if (IS_IVYBRIDGE(dev_priv)) {
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 921a584c3284..bc2c5104f755 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -521,7 +521,7 @@ int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data,
 u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc);
 void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state);
 
-int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp);
+int ilk_get_lanes_required(int target_clock, int link_bw, int bpp);
 void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
 			 struct intel_digital_port *dport,
 			 unsigned int expected_mask);
@@ -579,7 +579,7 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
 u16 skl_scaler_calc_phase(int sub, int scale, bool chroma_center);
 int skl_update_scaler_crtc(struct intel_crtc_state *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 ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state);
 u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
 			const struct intel_plane_state *plane_state);
 u32 glk_plane_color_ctl_crtc(const struct intel_crtc_state *crtc_state);
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 2f31d226c6eb..991f343579ef 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2509,7 +2509,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,
 	 *
 	 * CPT PCH is quite different, having many bits moved
 	 * to the TRANS_DP_CTL register instead. That
-	 * configuration happens (oddly) in ironlake_pch_enable
+	 * configuration happens (oddly) in ilk_pch_enable
 	 */
 
 	/* Preserve the BIOS-computed detected bit. This is
@@ -2653,7 +2653,7 @@ static void edp_wait_backlight_off(struct intel_dp *intel_dp)
  * is locked
  */
 
-static  u32 ironlake_get_pp_control(struct intel_dp *intel_dp)
+static  u32 ilk_get_pp_control(struct intel_dp *intel_dp)
 {
 	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
 	u32 control;
@@ -2703,7 +2703,7 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)
 	if (!edp_have_panel_power(intel_dp))
 		wait_panel_power_cycle(intel_dp);
 
-	pp = ironlake_get_pp_control(intel_dp);
+	pp = ilk_get_pp_control(intel_dp);
 	pp |= EDP_FORCE_VDD;
 
 	pp_stat_reg = _pp_stat_reg(intel_dp);
@@ -2768,7 +2768,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)
 		      intel_dig_port->base.base.base.id,
 		      intel_dig_port->base.base.name);
 
-	pp = ironlake_get_pp_control(intel_dp);
+	pp = ilk_get_pp_control(intel_dp);
 	pp &= ~EDP_FORCE_VDD;
 
 	pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
@@ -2864,7 +2864,7 @@ static void edp_panel_on(struct intel_dp *intel_dp)
 	wait_panel_power_cycle(intel_dp);
 
 	pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
-	pp = ironlake_get_pp_control(intel_dp);
+	pp = ilk_get_pp_control(intel_dp);
 	if (IS_GEN(dev_priv, 5)) {
 		/* ILK workaround: disable reset around power sequence */
 		pp &= ~PANEL_POWER_RESET;
@@ -2919,7 +2919,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)
 	WARN(!intel_dp->want_panel_vdd, "Need [ENCODER:%d:%s] VDD to turn off panel\n",
 	     dig_port->base.base.base.id, dig_port->base.base.name);
 
-	pp = ironlake_get_pp_control(intel_dp);
+	pp = ilk_get_pp_control(intel_dp);
 	/* We need to switch off panel power _and_ force vdd, for otherwise some
 	 * panels get very unhappy and cease to work. */
 	pp &= ~(PANEL_POWER_ON | PANEL_POWER_RESET | EDP_FORCE_VDD |
@@ -2968,7 +2968,7 @@ static void _intel_edp_backlight_on(struct intel_dp *intel_dp)
 		i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
 		u32 pp;
 
-		pp = ironlake_get_pp_control(intel_dp);
+		pp = ilk_get_pp_control(intel_dp);
 		pp |= EDP_BLC_ENABLE;
 
 		I915_WRITE(pp_ctrl_reg, pp);
@@ -3004,7 +3004,7 @@ static void _intel_edp_backlight_off(struct intel_dp *intel_dp)
 		i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
 		u32 pp;
 
-		pp = ironlake_get_pp_control(intel_dp);
+		pp = ilk_get_pp_control(intel_dp);
 		pp &= ~EDP_BLC_ENABLE;
 
 		I915_WRITE(pp_ctrl_reg, pp);
@@ -3042,7 +3042,7 @@ static void intel_edp_backlight_power(struct intel_connector *connector,
 
 	is_enabled = false;
 	with_pps_lock(intel_dp, wakeref)
-		is_enabled = ironlake_get_pp_control(intel_dp) & EDP_BLC_ENABLE;
+		is_enabled = ilk_get_pp_control(intel_dp) & EDP_BLC_ENABLE;
 	if (is_enabled == enable)
 		return;
 
@@ -3079,8 +3079,8 @@ static void assert_edp_pll(struct drm_i915_private *dev_priv, bool state)
 #define assert_edp_pll_enabled(d) assert_edp_pll((d), true)
 #define assert_edp_pll_disabled(d) assert_edp_pll((d), false)
 
-static void ironlake_edp_pll_on(struct intel_dp *intel_dp,
-				const struct intel_crtc_state *pipe_config)
+static void ilk_edp_pll_on(struct intel_dp *intel_dp,
+			   const struct intel_crtc_state *pipe_config)
 {
 	struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -3119,8 +3119,8 @@ static void ironlake_edp_pll_on(struct intel_dp *intel_dp,
 	udelay(200);
 }
 
-static void ironlake_edp_pll_off(struct intel_dp *intel_dp,
-				 const struct intel_crtc_state *old_crtc_state)
+static void ilk_edp_pll_off(struct intel_dp *intel_dp,
+			    const struct intel_crtc_state *old_crtc_state)
 {
 	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -3410,7 +3410,7 @@ static void g4x_post_disable_dp(struct intel_encoder *encoder,
 
 	/* Only ilk+ has port A */
 	if (port == PORT_A)
-		ironlake_edp_pll_off(intel_dp, old_crtc_state);
+		ilk_edp_pll_off(intel_dp, old_crtc_state);
 }
 
 static void vlv_post_disable_dp(struct intel_encoder *encoder,
@@ -3615,7 +3615,7 @@ static void g4x_pre_enable_dp(struct intel_encoder *encoder,
 
 	/* Only ilk+ has port A */
 	if (port == PORT_A)
-		ironlake_edp_pll_on(intel_dp, pipe_config);
+		ilk_edp_pll_on(intel_dp, pipe_config);
 }
 
 static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)
@@ -6693,7 +6693,7 @@ intel_pps_readout_hw_state(struct intel_dp *intel_dp, struct edp_power_seq *seq)
 
 	intel_pps_get_registers(intel_dp, &regs);
 
-	pp_ctl = ironlake_get_pp_control(intel_dp);
+	pp_ctl = ilk_get_pp_control(intel_dp);
 
 	/* Ensure PPS is unlocked */
 	if (!HAS_DDI(dev_priv))
@@ -6863,7 +6863,7 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp,
 	 * soon as the new power sequencer gets initialized.
 	 */
 	if (force_disable_vdd) {
-		u32 pp = ironlake_get_pp_control(intel_dp);
+		u32 pp = ilk_get_pp_control(intel_dp);
 
 		WARN(pp & PANEL_POWER_ON, "Panel power already on\n");
 
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 01b4608ab56c..cbf623154af1 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -250,7 +250,7 @@ static void intel_mst_post_disable_dp(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);
 
 	/*
 	 * From TGL spec: "If multi-stream slave transcoder: Configure
diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
index ab61f88d1d33..d6e0d0be842e 100644
--- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
+++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
@@ -126,8 +126,8 @@ static void i9xx_set_fifo_underrun_reporting(struct drm_device *dev,
 	}
 }
 
-static void ironlake_set_fifo_underrun_reporting(struct drm_device *dev,
-						 enum pipe pipe, bool enable)
+static void ilk_set_fifo_underrun_reporting(struct drm_device *dev,
+					    enum pipe pipe, bool enable)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	u32 bit = (pipe == PIPE_A) ?
@@ -264,7 +264,7 @@ static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev,
 	if (HAS_GMCH(dev_priv))
 		i9xx_set_fifo_underrun_reporting(dev, pipe, enable, old);
 	else if (IS_GEN_RANGE(dev_priv, 5, 6))
-		ironlake_set_fifo_underrun_reporting(dev, pipe, enable);
+		ilk_set_fifo_underrun_reporting(dev, pipe, enable);
 	else if (IS_GEN(dev_priv, 7))
 		ivybridge_set_fifo_underrun_reporting(dev, pipe, enable, old);
 	else if (INTEL_GEN(dev_priv) >= 8)
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index 1c51296646e0..ea7069e238d0 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -251,9 +251,8 @@ static int g4x_do_reset(struct intel_gt *gt,
 	return ret;
 }
 
-static int ironlake_do_reset(struct intel_gt *gt,
-			     intel_engine_mask_t engine_mask,
-			     unsigned int retry)
+static int ilk_do_reset(struct intel_gt *gt, intel_engine_mask_t engine_mask,
+			unsigned int retry)
 {
 	struct intel_uncore *uncore = gt->uncore;
 	int ret;
@@ -597,7 +596,7 @@ static reset_func intel_get_gpu_reset(const struct intel_gt *gt)
 	else if (INTEL_GEN(i915) >= 6)
 		return gen6_reset_engines;
 	else if (INTEL_GEN(i915) >= 5)
-		return ironlake_do_reset;
+		return ilk_do_reset;
 	else if (IS_G4X(i915))
 		return g4x_do_reset;
 	else if (IS_G33(i915) || IS_PINEVIEW(i915))
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index d28468eaed57..0407229251bc 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1001,7 +1001,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
 	return ret;
 }
 
-static int ironlake_drpc_info(struct seq_file *m)
+static int ilk_drpc_info(struct seq_file *m)
 {
 	struct drm_i915_private *i915 = node_to_i915(m->private);
 	struct intel_uncore *uncore = &i915->uncore;
@@ -1209,7 +1209,7 @@ static int i915_drpc_info(struct seq_file *m, void *unused)
 		else if (INTEL_GEN(dev_priv) >= 6)
 			err = gen6_drpc_info(m);
 		else
-			err = ironlake_drpc_info(m);
+			err = ilk_drpc_info(m);
 	}
 
 	return err;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 42b79f577500..2d6324d2922a 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2031,7 +2031,7 @@ static void ivb_display_irq_handler(struct drm_i915_private *dev_priv,
  * 4 - Process the interrupt(s) that had bits set in the IIRs.
  * 5 - Re-enable Master Interrupt Control.
  */
-static irqreturn_t ironlake_irq_handler(int irq, void *arg)
+static irqreturn_t ilk_irq_handler(int irq, void *arg)
 {
 	struct drm_i915_private *dev_priv = arg;
 	u32 de_iir, gt_iir, de_ier, sde_ier = 0;
@@ -2742,7 +2742,7 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
 
 /* drm_dma.h hooks
 */
-static void ironlake_irq_reset(struct drm_i915_private *dev_priv)
+static void ilk_irq_reset(struct drm_i915_private *dev_priv)
 {
 	struct intel_uncore *uncore = &dev_priv->uncore;
 
@@ -3225,7 +3225,7 @@ static void ibx_irq_postinstall(struct drm_i915_private *dev_priv)
 		spt_hpd_detection_setup(dev_priv);
 }
 
-static void ironlake_irq_postinstall(struct drm_i915_private *dev_priv)
+static void ilk_irq_postinstall(struct drm_i915_private *dev_priv)
 {
 	struct intel_uncore *uncore = &dev_priv->uncore;
 	u32 display_mask, extra_mask;
@@ -3980,7 +3980,7 @@ static irq_handler_t intel_irq_handler(struct drm_i915_private *dev_priv)
 		else if (INTEL_GEN(dev_priv) >= 8)
 			return gen8_irq_handler;
 		else
-			return ironlake_irq_handler;
+			return ilk_irq_handler;
 	}
 }
 
@@ -4003,7 +4003,7 @@ static void intel_irq_reset(struct drm_i915_private *dev_priv)
 		else if (INTEL_GEN(dev_priv) >= 8)
 			gen8_irq_reset(dev_priv);
 		else
-			ironlake_irq_reset(dev_priv);
+			ilk_irq_reset(dev_priv);
 	}
 }
 
@@ -4026,7 +4026,7 @@ static void intel_irq_postinstall(struct drm_i915_private *dev_priv)
 		else if (INTEL_GEN(dev_priv) >= 8)
 			gen8_irq_postinstall(dev_priv);
 		else
-			ironlake_irq_postinstall(dev_priv);
+			ilk_irq_postinstall(dev_priv);
 	}
 }
 
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index eab3b029e98a..6fb6760a1559 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -178,7 +178,7 @@ static void pnv_get_mem_freq(struct drm_i915_private *dev_priv)
 	dev_priv->is_ddr3 = (tmp & CSHRDDR3CTL_DDR3) ? 1 : 0;
 }
 
-static void i915_ironlake_get_mem_freq(struct drm_i915_private *dev_priv)
+static void ilk_get_mem_freq(struct drm_i915_private *dev_priv)
 {
 	u16 ddrpll, csipll;
 
@@ -7182,7 +7182,7 @@ void intel_init_pm(struct drm_i915_private *dev_priv)
 	if (IS_PINEVIEW(dev_priv))
 		pnv_get_mem_freq(dev_priv);
 	else if (IS_GEN(dev_priv, 5))
-		i915_ironlake_get_mem_freq(dev_priv);
+		ilk_get_mem_freq(dev_priv);
 
 	if (intel_has_sagv(dev_priv))
 		skl_setup_sagv_block_time(dev_priv);
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v3 08/10] drm/i915: prefer 3-letter acronym for broadwell

[Lucas De Marchi]

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>
---
 drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 6 +++---
 drivers/gpu/drm/i915/gt/intel_workarounds.c        | 2 +-
 drivers/gpu/drm/i915/gvt/handlers.c                | 8 ++++----
 drivers/gpu/drm/i915/i915_debugfs.c                | 6 +++---
 drivers/gpu/drm/i915/intel_device_info.c           | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
index d6e0d0be842e..1f80f275f3f2 100644
--- 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 195ccf7db272..4e292d4bf7b9 100644
--- 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 1043e6d564df..6d28d72e6c7e 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -2691,7 +2691,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;
@@ -3380,20 +3380,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 0407229251bc..cb34e8c31511 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -3815,8 +3815,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);
@@ -3901,7 +3901,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 ca7a42e1d769..d87c31444fa8 100644
--- 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))
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v3 09/10] drm/i915: prefer 3-letter acronym for ivybridge

[Lucas De Marchi]

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: 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>
---
 drivers/gpu/drm/i915/display/intel_display.c       |  4 ++--
 drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 12 ++++++------
 drivers/gpu/drm/i915/i915_irq.c                    |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 5093fd08f381..faf6d2527a50 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5540,7 +5540,7 @@ static void cpt_set_fdi_bc_bifurcation(struct drm_i915_private *dev_priv, bool e
 	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 drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -5613,7 +5613,7 @@ static void ilk_pch_enable(const struct intel_atomic_state *state,
 	assert_pch_transcoder_disabled(dev_priv, pipe);
 
 	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
 	 * detection works. */
diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
index 1f80f275f3f2..6c83b350525d 100644
--- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
+++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
@@ -139,7 +139,7 @@ static void ilk_set_fifo_underrun_reporting(struct drm_device *dev,
 		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);
 	enum pipe pipe = crtc->pipe;
@@ -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));
 }
 
-static void ivybridge_set_fifo_underrun_reporting(struct drm_device *dev,
-						  enum pipe pipe,
-						  bool enable, bool old)
+static void ivb_set_fifo_underrun_reporting(struct drm_device *dev,
+					    enum pipe pipe, bool enable,
+					    bool old)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	if (enable) {
@@ -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))
 		ilk_set_fifo_underrun_reporting(dev, pipe, enable);
 	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)
 		bdw_set_fifo_underrun_reporting(dev, pipe, enable);
 
@@ -427,7 +427,7 @@ void intel_check_cpu_fifo_underruns(struct drm_i915_private *dev_priv)
 		if (HAS_GMCH(dev_priv))
 			i9xx_check_fifo_underruns(crtc);
 		else if (IS_GEN(dev_priv, 7))
-			ivybridge_check_fifo_underruns(crtc);
+			ivb_check_fifo_underruns(crtc);
 	}
 
 	spin_unlock_irq(&dev_priv->irq_lock);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 2d6324d2922a..afc6aad9bf8c 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -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.
  * @work: workqueue struct
  *
@@ -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
  * 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 =
 		container_of(work, typeof(*dev_priv), l3_parity.error_work);
@@ -3899,7 +3899,7 @@ void intel_irq_init(struct drm_i915_private *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)
 		dev_priv->l3_parity.remap_info[i] = NULL;
 
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v3 10/10] drm/i915: prefer 3-letter acronym for tigerlake

[Lucas De Marchi]

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 tigerlake to tgl 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>
---
 drivers/gpu/drm/i915/gt/intel_mocs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
index 95f1bc45953b..eeef90b55c64 100644
--- a/drivers/gpu/drm/i915/gt/intel_mocs.c
+++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
@@ -233,7 +233,7 @@ static const struct drm_i915_mocs_entry broxton_mocs_table[] = {
 		   LE_3_WB | LE_TC_1_LLC | LE_LRUM(3), \
 		   L3_1_UC)
 
-static const struct drm_i915_mocs_entry tigerlake_mocs_table[] = {
+static const struct drm_i915_mocs_entry tgl_mocs_table[] = {
 	/* Base - Error (Reserved for Non-Use) */
 	MOCS_ENTRY(0, 0x0, 0x0),
 	/* Base - Reserved */
@@ -284,8 +284,8 @@ static bool get_mocs_settings(const struct drm_i915_private *i915,
 			      struct drm_i915_mocs_table *table)
 {
 	if (INTEL_GEN(i915) >= 12) {
-		table->size  = ARRAY_SIZE(tigerlake_mocs_table);
-		table->table = tigerlake_mocs_table;
+		table->size  = ARRAY_SIZE(tgl_mocs_table);
+		table->table = tgl_mocs_table;
 		table->n_entries = GEN11_NUM_MOCS_ENTRIES;
 	} else if (IS_GEN(i915, 11)) {
 		table->size  = ARRAY_SIZE(icl_mocs_table);
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.BUILD: failure for Prefer acronym for prefixes (rev2)

[Patchwork]

== Series Details ==

Series: Prefer acronym for prefixes (rev2)
URL   : https://patchwork.freedesktop.org/series/71224/
State : failure

== Summary ==

Applying: drm/i915: simplify prefixes on device_info
Applying: drm/i915: prefer 3-letter acronym for pineview
Applying: drm/i915: prefer 3-letter acronym for haswell
Applying: drm/i915: prefer 3-letter acronym for skylake
Applying: drm/i915: prefer 3-letter acronym for cannonlake
Applying: drm/i915: prefer 3-letter acronym for icelake
Applying: drm/i915: prefer 3-letter acronym for ironlake
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/display/intel_display.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0007 drm/i915: prefer 3-letter acronym for ironlake
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for Prefer acronym for prefixes (rev2)

[Lucas De Marchi]

On Mon, Dec 23, 2019 at 07:34:16PM +0000, Patchwork wrote:
>== Series Details ==
>
>Series: Prefer acronym for prefixes (rev2)
>URL   : https://patchwork.freedesktop.org/series/71224/
>State : failure
>
>== Summary ==
>
>Applying: drm/i915: simplify prefixes on device_info
>Applying: drm/i915: prefer 3-letter acronym for pineview
>Applying: drm/i915: prefer 3-letter acronym for haswell
>Applying: drm/i915: prefer 3-letter acronym for skylake
>Applying: drm/i915: prefer 3-letter acronym for cannonlake
>Applying: drm/i915: prefer 3-letter acronym for icelake
>Applying: drm/i915: prefer 3-letter acronym for ironlake
>error: sha1 information is lacking or useless (drivers/gpu/drm/i915/display/intel_display.c).
>error: could not build fake ancestor
>hint: Use 'git am --show-current-patch' to see the failed patch
>Patch failed at 0007 drm/i915: prefer 3-letter acronym for ironlake
>When you have resolved this problem, run "git am --continue".
>If you prefer to skip this patch, run "git am --skip" instead.
>To restore the original branch and stop patching, run "git am --abort".

poor bot, dim retip works ok here. I will wait to see if I get r-b
before sending another rebase of these trivial changes.

Lucas De Marchi


>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 01/10] drm/i915: simplify prefixes on device_info

[Matt Roper]

On Mon, Dec 23, 2019 at 09:32:35AM -0800, Lucas De Marchi wrote:
> Drop the intel prefix since all these structs are static and prefer
> using the 3-letter prefix for each platform.
> 
> v2: also remove gen from the device info (Ville)
> 
> 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>

> ---
>  drivers/gpu/drm/i915/i915_pci.c | 230 ++++++++++++++++----------------
>  1 file changed, 115 insertions(+), 115 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 9571611b4b16..83f01401b8b5 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -193,23 +193,23 @@
>  	GEN_DEFAULT_PAGE_SIZES, \
>  	GEN_DEFAULT_REGIONS
>  
> -static const struct intel_device_info intel_i830_info = {
> +static const struct intel_device_info i830_info = {
>  	I830_FEATURES,
>  	PLATFORM(INTEL_I830),
>  };
>  
> -static const struct intel_device_info intel_i845g_info = {
> +static const struct intel_device_info i845g_info = {
>  	I845_FEATURES,
>  	PLATFORM(INTEL_I845G),
>  };
>  
> -static const struct intel_device_info intel_i85x_info = {
> +static const struct intel_device_info i85x_info = {
>  	I830_FEATURES,
>  	PLATFORM(INTEL_I85X),
>  	.display.has_fbc = 1,
>  };
>  
> -static const struct intel_device_info intel_i865g_info = {
> +static const struct intel_device_info i865g_info = {
>  	I845_FEATURES,
>  	PLATFORM(INTEL_I865G),
>  };
> @@ -228,7 +228,7 @@ static const struct intel_device_info intel_i865g_info = {
>  	GEN_DEFAULT_PAGE_SIZES, \
>  	GEN_DEFAULT_REGIONS
>  
> -static const struct intel_device_info intel_i915g_info = {
> +static const struct intel_device_info i915g_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_I915G),
>  	.has_coherent_ggtt = false,
> @@ -239,7 +239,7 @@ static const struct intel_device_info intel_i915g_info = {
>  	.unfenced_needs_alignment = 1,
>  };
>  
> -static const struct intel_device_info intel_i915gm_info = {
> +static const struct intel_device_info i915gm_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_I915GM),
>  	.is_mobile = 1,
> @@ -252,7 +252,7 @@ static const struct intel_device_info intel_i915gm_info = {
>  	.unfenced_needs_alignment = 1,
>  };
>  
> -static const struct intel_device_info intel_i945g_info = {
> +static const struct intel_device_info i945g_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_I945G),
>  	.display.has_hotplug = 1,
> @@ -263,7 +263,7 @@ static const struct intel_device_info intel_i945g_info = {
>  	.unfenced_needs_alignment = 1,
>  };
>  
> -static const struct intel_device_info intel_i945gm_info = {
> +static const struct intel_device_info i945gm_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_I945GM),
>  	.is_mobile = 1,
> @@ -277,21 +277,21 @@ static const struct intel_device_info intel_i945gm_info = {
>  	.unfenced_needs_alignment = 1,
>  };
>  
> -static const struct intel_device_info intel_g33_info = {
> +static const struct intel_device_info g33_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_G33),
>  	.display.has_hotplug = 1,
>  	.display.has_overlay = 1,
>  };
>  
> -static const struct intel_device_info intel_pineview_g_info = {
> +static const struct intel_device_info pnv_g_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_PINEVIEW),
>  	.display.has_hotplug = 1,
>  	.display.has_overlay = 1,
>  };
>  
> -static const struct intel_device_info intel_pineview_m_info = {
> +static const struct intel_device_info pnv_m_info = {
>  	GEN3_FEATURES,
>  	PLATFORM(INTEL_PINEVIEW),
>  	.is_mobile = 1,
> @@ -314,7 +314,7 @@ static const struct intel_device_info intel_pineview_m_info = {
>  	GEN_DEFAULT_PAGE_SIZES, \
>  	GEN_DEFAULT_REGIONS
>  
> -static const struct intel_device_info intel_i965g_info = {
> +static const struct intel_device_info i965g_info = {
>  	GEN4_FEATURES,
>  	PLATFORM(INTEL_I965G),
>  	.display.has_overlay = 1,
> @@ -322,7 +322,7 @@ static const struct intel_device_info intel_i965g_info = {
>  	.has_snoop = false,
>  };
>  
> -static const struct intel_device_info intel_i965gm_info = {
> +static const struct intel_device_info i965gm_info = {
>  	GEN4_FEATURES,
>  	PLATFORM(INTEL_I965GM),
>  	.is_mobile = 1,
> @@ -333,14 +333,14 @@ static const struct intel_device_info intel_i965gm_info = {
>  	.has_snoop = false,
>  };
>  
> -static const struct intel_device_info intel_g45_info = {
> +static const struct intel_device_info g45_info = {
>  	GEN4_FEATURES,
>  	PLATFORM(INTEL_G45),
>  	.engine_mask = BIT(RCS0) | BIT(VCS0),
>  	.gpu_reset_clobbers_display = false,
>  };
>  
> -static const struct intel_device_info intel_gm45_info = {
> +static const struct intel_device_info gm45_info = {
>  	GEN4_FEATURES,
>  	PLATFORM(INTEL_GM45),
>  	.is_mobile = 1,
> @@ -365,12 +365,12 @@ static const struct intel_device_info intel_gm45_info = {
>  	GEN_DEFAULT_PAGE_SIZES, \
>  	GEN_DEFAULT_REGIONS
>  
> -static const struct intel_device_info intel_ironlake_d_info = {
> +static const struct intel_device_info ilk_d_info = {
>  	GEN5_FEATURES,
>  	PLATFORM(INTEL_IRONLAKE),
>  };
>  
> -static const struct intel_device_info intel_ironlake_m_info = {
> +static const struct intel_device_info ilk_m_info = {
>  	GEN5_FEATURES,
>  	PLATFORM(INTEL_IRONLAKE),
>  	.is_mobile = 1,
> @@ -400,12 +400,12 @@ static const struct intel_device_info intel_ironlake_m_info = {
>  	GEN6_FEATURES, \
>  	PLATFORM(INTEL_SANDYBRIDGE)
>  
> -static const struct intel_device_info intel_sandybridge_d_gt1_info = {
> +static const struct intel_device_info snb_d_gt1_info = {
>  	SNB_D_PLATFORM,
>  	.gt = 1,
>  };
>  
> -static const struct intel_device_info intel_sandybridge_d_gt2_info = {
> +static const struct intel_device_info snb_d_gt2_info = {
>  	SNB_D_PLATFORM,
>  	.gt = 2,
>  };
> @@ -416,12 +416,12 @@ static const struct intel_device_info intel_sandybridge_d_gt2_info = {
>  	.is_mobile = 1
>  
>  
> -static const struct intel_device_info intel_sandybridge_m_gt1_info = {
> +static const struct intel_device_info snb_m_gt1_info = {
>  	SNB_M_PLATFORM,
>  	.gt = 1,
>  };
>  
> -static const struct intel_device_info intel_sandybridge_m_gt2_info = {
> +static const struct intel_device_info snb_m_gt2_info = {
>  	SNB_M_PLATFORM,
>  	.gt = 2,
>  };
> @@ -450,12 +450,12 @@ static const struct intel_device_info intel_sandybridge_m_gt2_info = {
>  	PLATFORM(INTEL_IVYBRIDGE), \
>  	.has_l3_dpf = 1
>  
> -static const struct intel_device_info intel_ivybridge_d_gt1_info = {
> +static const struct intel_device_info ivb_d_gt1_info = {
>  	IVB_D_PLATFORM,
>  	.gt = 1,
>  };
>  
> -static const struct intel_device_info intel_ivybridge_d_gt2_info = {
> +static const struct intel_device_info ivb_d_gt2_info = {
>  	IVB_D_PLATFORM,
>  	.gt = 2,
>  };
> @@ -466,17 +466,17 @@ static const struct intel_device_info intel_ivybridge_d_gt2_info = {
>  	.is_mobile = 1, \
>  	.has_l3_dpf = 1
>  
> -static const struct intel_device_info intel_ivybridge_m_gt1_info = {
> +static const struct intel_device_info ivb_m_gt1_info = {
>  	IVB_M_PLATFORM,
>  	.gt = 1,
>  };
>  
> -static const struct intel_device_info intel_ivybridge_m_gt2_info = {
> +static const struct intel_device_info ivb_m_gt2_info = {
>  	IVB_M_PLATFORM,
>  	.gt = 2,
>  };
>  
> -static const struct intel_device_info intel_ivybridge_q_info = {
> +static const struct intel_device_info ivb_q_info = {
>  	GEN7_FEATURES,
>  	PLATFORM(INTEL_IVYBRIDGE),
>  	.gt = 2,
> @@ -484,7 +484,7 @@ static const struct intel_device_info intel_ivybridge_q_info = {
>  	.has_l3_dpf = 1,
>  };
>  
> -static const struct intel_device_info intel_valleyview_info = {
> +static const struct intel_device_info vlv_info = {
>  	PLATFORM(INTEL_VALLEYVIEW),
>  	GEN(7),
>  	.is_lp = 1,
> @@ -523,17 +523,17 @@ static const struct intel_device_info intel_valleyview_info = {
>  	PLATFORM(INTEL_HASWELL), \
>  	.has_l3_dpf = 1
>  
> -static const struct intel_device_info intel_haswell_gt1_info = {
> +static const struct intel_device_info hsw_gt1_info = {
>  	HSW_PLATFORM,
>  	.gt = 1,
>  };
>  
> -static const struct intel_device_info intel_haswell_gt2_info = {
> +static const struct intel_device_info hsw_gt2_info = {
>  	HSW_PLATFORM,
>  	.gt = 2,
>  };
>  
> -static const struct intel_device_info intel_haswell_gt3_info = {
> +static const struct intel_device_info hsw_gt3_info = {
>  	HSW_PLATFORM,
>  	.gt = 3,
>  };
> @@ -551,17 +551,17 @@ static const struct intel_device_info intel_haswell_gt3_info = {
>  	GEN8_FEATURES, \
>  	PLATFORM(INTEL_BROADWELL)
>  
> -static const struct intel_device_info intel_broadwell_gt1_info = {
> +static const struct intel_device_info bdw_gt1_info = {
>  	BDW_PLATFORM,
>  	.gt = 1,
>  };
>  
> -static const struct intel_device_info intel_broadwell_gt2_info = {
> +static const struct intel_device_info bdw_gt2_info = {
>  	BDW_PLATFORM,
>  	.gt = 2,
>  };
>  
> -static const struct intel_device_info intel_broadwell_rsvd_info = {
> +static const struct intel_device_info bdw_rsvd_info = {
>  	BDW_PLATFORM,
>  	.gt = 3,
>  	/* According to the device ID those devices are GT3, they were
> @@ -569,14 +569,14 @@ static const struct intel_device_info intel_broadwell_rsvd_info = {
>  	 */
>  };
>  
> -static const struct intel_device_info intel_broadwell_gt3_info = {
> +static const struct intel_device_info bdw_gt3_info = {
>  	BDW_PLATFORM,
>  	.gt = 3,
>  	.engine_mask =
>  		BIT(RCS0) | BIT(VCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS1),
>  };
>  
> -static const struct intel_device_info intel_cherryview_info = {
> +static const struct intel_device_info chv_info = {
>  	PLATFORM(INTEL_CHERRYVIEW),
>  	GEN(8),
>  	.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C),
> @@ -621,12 +621,12 @@ static const struct intel_device_info intel_cherryview_info = {
>  	GEN9_FEATURES, \
>  	PLATFORM(INTEL_SKYLAKE)
>  
> -static const struct intel_device_info intel_skylake_gt1_info = {
> +static const struct intel_device_info skl_gt1_info = {
>  	SKL_PLATFORM,
>  	.gt = 1,
>  };
>  
> -static const struct intel_device_info intel_skylake_gt2_info = {
> +static const struct intel_device_info skl_gt2_info = {
>  	SKL_PLATFORM,
>  	.gt = 2,
>  };
> @@ -637,12 +637,12 @@ static const struct intel_device_info intel_skylake_gt2_info = {
>  		BIT(RCS0) | BIT(VCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS1)
>  
>  
> -static const struct intel_device_info intel_skylake_gt3_info = {
> +static const struct intel_device_info skl_gt3_info = {
>  	SKL_GT3_PLUS_PLATFORM,
>  	.gt = 3,
>  };
>  
> -static const struct intel_device_info intel_skylake_gt4_info = {
> +static const struct intel_device_info skl_gt4_info = {
>  	SKL_GT3_PLUS_PLATFORM,
>  	.gt = 4,
>  };
> @@ -679,13 +679,13 @@ static const struct intel_device_info intel_skylake_gt4_info = {
>  	GEN9_DEFAULT_PAGE_SIZES, \
>  	GEN_DEFAULT_REGIONS
>  
> -static const struct intel_device_info intel_broxton_info = {
> +static const struct intel_device_info bxt_info = {
>  	GEN9_LP_FEATURES,
>  	PLATFORM(INTEL_BROXTON),
>  	.ddb_size = 512,
>  };
>  
> -static const struct intel_device_info intel_geminilake_info = {
> +static const struct intel_device_info glk_info = {
>  	GEN9_LP_FEATURES,
>  	PLATFORM(INTEL_GEMINILAKE),
>  	.ddb_size = 1024,
> @@ -696,17 +696,17 @@ static const struct intel_device_info intel_geminilake_info = {
>  	GEN9_FEATURES, \
>  	PLATFORM(INTEL_KABYLAKE)
>  
> -static const struct intel_device_info intel_kabylake_gt1_info = {
> +static const struct intel_device_info kbl_gt1_info = {
>  	KBL_PLATFORM,
>  	.gt = 1,
>  };
>  
> -static const struct intel_device_info intel_kabylake_gt2_info = {
> +static const struct intel_device_info kbl_gt2_info = {
>  	KBL_PLATFORM,
>  	.gt = 2,
>  };
>  
> -static const struct intel_device_info intel_kabylake_gt3_info = {
> +static const struct intel_device_info kbl_gt3_info = {
>  	KBL_PLATFORM,
>  	.gt = 3,
>  	.engine_mask =
> @@ -717,17 +717,17 @@ static const struct intel_device_info intel_kabylake_gt3_info = {
>  	GEN9_FEATURES, \
>  	PLATFORM(INTEL_COFFEELAKE)
>  
> -static const struct intel_device_info intel_coffeelake_gt1_info = {
> +static const struct intel_device_info cfl_gt1_info = {
>  	CFL_PLATFORM,
>  	.gt = 1,
>  };
>  
> -static const struct intel_device_info intel_coffeelake_gt2_info = {
> +static const struct intel_device_info cfl_gt2_info = {
>  	CFL_PLATFORM,
>  	.gt = 2,
>  };
>  
> -static const struct intel_device_info intel_coffeelake_gt3_info = {
> +static const struct intel_device_info cfl_gt3_info = {
>  	CFL_PLATFORM,
>  	.gt = 3,
>  	.engine_mask =
> @@ -742,7 +742,7 @@ static const struct intel_device_info intel_coffeelake_gt3_info = {
>  	.has_coherent_ggtt = false, \
>  	GLK_COLORS
>  
> -static const struct intel_device_info intel_cannonlake_info = {
> +static const struct intel_device_info cnl_info = {
>  	GEN10_FEATURES,
>  	PLATFORM(INTEL_CANNONLAKE),
>  	.gt = 2,
> @@ -777,14 +777,14 @@ static const struct intel_device_info intel_cannonlake_info = {
>  	.has_logical_ring_elsq = 1, \
>  	.color = { .degamma_lut_size = 33, .gamma_lut_size = 262145 }
>  
> -static const struct intel_device_info intel_icelake_11_info = {
> +static const struct intel_device_info icl_info = {
>  	GEN11_FEATURES,
>  	PLATFORM(INTEL_ICELAKE),
>  	.engine_mask =
>  		BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2),
>  };
>  
> -static const struct intel_device_info intel_elkhartlake_info = {
> +static const struct intel_device_info ehl_info = {
>  	GEN11_FEATURES,
>  	PLATFORM(INTEL_ELKHARTLAKE),
>  	.require_force_probe = 1,
> @@ -815,7 +815,7 @@ static const struct intel_device_info intel_elkhartlake_info = {
>  	.has_global_mocs = 1, \
>  	.display.has_dsb = 1
>  
> -static const struct intel_device_info intel_tigerlake_12_info = {
> +static const struct intel_device_info tgl_info = {
>  	GEN12_FEATURES,
>  	PLATFORM(INTEL_TIGERLAKE),
>  	.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D),
> @@ -840,70 +840,70 @@ static const struct intel_device_info intel_tigerlake_12_info = {
>   * PCI ID matches, otherwise we'll use the wrong info struct above.
>   */
>  static const struct pci_device_id pciidlist[] = {
> -	INTEL_I830_IDS(&intel_i830_info),
> -	INTEL_I845G_IDS(&intel_i845g_info),
> -	INTEL_I85X_IDS(&intel_i85x_info),
> -	INTEL_I865G_IDS(&intel_i865g_info),
> -	INTEL_I915G_IDS(&intel_i915g_info),
> -	INTEL_I915GM_IDS(&intel_i915gm_info),
> -	INTEL_I945G_IDS(&intel_i945g_info),
> -	INTEL_I945GM_IDS(&intel_i945gm_info),
> -	INTEL_I965G_IDS(&intel_i965g_info),
> -	INTEL_G33_IDS(&intel_g33_info),
> -	INTEL_I965GM_IDS(&intel_i965gm_info),
> -	INTEL_GM45_IDS(&intel_gm45_info),
> -	INTEL_G45_IDS(&intel_g45_info),
> -	INTEL_PINEVIEW_G_IDS(&intel_pineview_g_info),
> -	INTEL_PINEVIEW_M_IDS(&intel_pineview_m_info),
> -	INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),
> -	INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),
> -	INTEL_SNB_D_GT1_IDS(&intel_sandybridge_d_gt1_info),
> -	INTEL_SNB_D_GT2_IDS(&intel_sandybridge_d_gt2_info),
> -	INTEL_SNB_M_GT1_IDS(&intel_sandybridge_m_gt1_info),
> -	INTEL_SNB_M_GT2_IDS(&intel_sandybridge_m_gt2_info),
> -	INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */
> -	INTEL_IVB_M_GT1_IDS(&intel_ivybridge_m_gt1_info),
> -	INTEL_IVB_M_GT2_IDS(&intel_ivybridge_m_gt2_info),
> -	INTEL_IVB_D_GT1_IDS(&intel_ivybridge_d_gt1_info),
> -	INTEL_IVB_D_GT2_IDS(&intel_ivybridge_d_gt2_info),
> -	INTEL_HSW_GT1_IDS(&intel_haswell_gt1_info),
> -	INTEL_HSW_GT2_IDS(&intel_haswell_gt2_info),
> -	INTEL_HSW_GT3_IDS(&intel_haswell_gt3_info),
> -	INTEL_VLV_IDS(&intel_valleyview_info),
> -	INTEL_BDW_GT1_IDS(&intel_broadwell_gt1_info),
> -	INTEL_BDW_GT2_IDS(&intel_broadwell_gt2_info),
> -	INTEL_BDW_GT3_IDS(&intel_broadwell_gt3_info),
> -	INTEL_BDW_RSVD_IDS(&intel_broadwell_rsvd_info),
> -	INTEL_CHV_IDS(&intel_cherryview_info),
> -	INTEL_SKL_GT1_IDS(&intel_skylake_gt1_info),
> -	INTEL_SKL_GT2_IDS(&intel_skylake_gt2_info),
> -	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),
> -	INTEL_SKL_GT4_IDS(&intel_skylake_gt4_info),
> -	INTEL_BXT_IDS(&intel_broxton_info),
> -	INTEL_GLK_IDS(&intel_geminilake_info),
> -	INTEL_KBL_GT1_IDS(&intel_kabylake_gt1_info),
> -	INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info),
> -	INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info),
> -	INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info),
> -	INTEL_AML_KBL_GT2_IDS(&intel_kabylake_gt2_info),
> -	INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info),
> -	INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info),
> -	INTEL_CFL_H_GT1_IDS(&intel_coffeelake_gt1_info),
> -	INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info),
> -	INTEL_CFL_U_GT2_IDS(&intel_coffeelake_gt2_info),
> -	INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
> -	INTEL_WHL_U_GT1_IDS(&intel_coffeelake_gt1_info),
> -	INTEL_WHL_U_GT2_IDS(&intel_coffeelake_gt2_info),
> -	INTEL_AML_CFL_GT2_IDS(&intel_coffeelake_gt2_info),
> -	INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info),
> -	INTEL_CML_GT1_IDS(&intel_coffeelake_gt1_info),
> -	INTEL_CML_GT2_IDS(&intel_coffeelake_gt2_info),
> -	INTEL_CML_U_GT1_IDS(&intel_coffeelake_gt1_info),
> -	INTEL_CML_U_GT2_IDS(&intel_coffeelake_gt2_info),
> -	INTEL_CNL_IDS(&intel_cannonlake_info),
> -	INTEL_ICL_11_IDS(&intel_icelake_11_info),
> -	INTEL_EHL_IDS(&intel_elkhartlake_info),
> -	INTEL_TGL_12_IDS(&intel_tigerlake_12_info),
> +	INTEL_I830_IDS(&i830_info),
> +	INTEL_I845G_IDS(&i845g_info),
> +	INTEL_I85X_IDS(&i85x_info),
> +	INTEL_I865G_IDS(&i865g_info),
> +	INTEL_I915G_IDS(&i915g_info),
> +	INTEL_I915GM_IDS(&i915gm_info),
> +	INTEL_I945G_IDS(&i945g_info),
> +	INTEL_I945GM_IDS(&i945gm_info),
> +	INTEL_I965G_IDS(&i965g_info),
> +	INTEL_G33_IDS(&g33_info),
> +	INTEL_I965GM_IDS(&i965gm_info),
> +	INTEL_GM45_IDS(&gm45_info),
> +	INTEL_G45_IDS(&g45_info),
> +	INTEL_PINEVIEW_G_IDS(&pnv_g_info),
> +	INTEL_PINEVIEW_M_IDS(&pnv_m_info),
> +	INTEL_IRONLAKE_D_IDS(&ilk_d_info),
> +	INTEL_IRONLAKE_M_IDS(&ilk_m_info),
> +	INTEL_SNB_D_GT1_IDS(&snb_d_gt1_info),
> +	INTEL_SNB_D_GT2_IDS(&snb_d_gt2_info),
> +	INTEL_SNB_M_GT1_IDS(&snb_m_gt1_info),
> +	INTEL_SNB_M_GT2_IDS(&snb_m_gt2_info),
> +	INTEL_IVB_Q_IDS(&ivb_q_info), /* must be first IVB */
> +	INTEL_IVB_M_GT1_IDS(&ivb_m_gt1_info),
> +	INTEL_IVB_M_GT2_IDS(&ivb_m_gt2_info),
> +	INTEL_IVB_D_GT1_IDS(&ivb_d_gt1_info),
> +	INTEL_IVB_D_GT2_IDS(&ivb_d_gt2_info),
> +	INTEL_HSW_GT1_IDS(&hsw_gt1_info),
> +	INTEL_HSW_GT2_IDS(&hsw_gt2_info),
> +	INTEL_HSW_GT3_IDS(&hsw_gt3_info),
> +	INTEL_VLV_IDS(&vlv_info),
> +	INTEL_BDW_GT1_IDS(&bdw_gt1_info),
> +	INTEL_BDW_GT2_IDS(&bdw_gt2_info),
> +	INTEL_BDW_GT3_IDS(&bdw_gt3_info),
> +	INTEL_BDW_RSVD_IDS(&bdw_rsvd_info),
> +	INTEL_CHV_IDS(&chv_info),
> +	INTEL_SKL_GT1_IDS(&skl_gt1_info),
> +	INTEL_SKL_GT2_IDS(&skl_gt2_info),
> +	INTEL_SKL_GT3_IDS(&skl_gt3_info),
> +	INTEL_SKL_GT4_IDS(&skl_gt4_info),
> +	INTEL_BXT_IDS(&bxt_info),
> +	INTEL_GLK_IDS(&glk_info),
> +	INTEL_KBL_GT1_IDS(&kbl_gt1_info),
> +	INTEL_KBL_GT2_IDS(&kbl_gt2_info),
> +	INTEL_KBL_GT3_IDS(&kbl_gt3_info),
> +	INTEL_KBL_GT4_IDS(&kbl_gt3_info),
> +	INTEL_AML_KBL_GT2_IDS(&kbl_gt2_info),
> +	INTEL_CFL_S_GT1_IDS(&cfl_gt1_info),
> +	INTEL_CFL_S_GT2_IDS(&cfl_gt2_info),
> +	INTEL_CFL_H_GT1_IDS(&cfl_gt1_info),
> +	INTEL_CFL_H_GT2_IDS(&cfl_gt2_info),
> +	INTEL_CFL_U_GT2_IDS(&cfl_gt2_info),
> +	INTEL_CFL_U_GT3_IDS(&cfl_gt3_info),
> +	INTEL_WHL_U_GT1_IDS(&cfl_gt1_info),
> +	INTEL_WHL_U_GT2_IDS(&cfl_gt2_info),
> +	INTEL_AML_CFL_GT2_IDS(&cfl_gt2_info),
> +	INTEL_WHL_U_GT3_IDS(&cfl_gt3_info),
> +	INTEL_CML_GT1_IDS(&cfl_gt1_info),
> +	INTEL_CML_GT2_IDS(&cfl_gt2_info),
> +	INTEL_CML_U_GT1_IDS(&cfl_gt1_info),
> +	INTEL_CML_U_GT2_IDS(&cfl_gt2_info),
> +	INTEL_CNL_IDS(&cnl_info),
> +	INTEL_ICL_11_IDS(&icl_info),
> +	INTEL_EHL_IDS(&ehl_info),
> +	INTEL_TGL_12_IDS(&tgl_info),
>  	{0, 0, 0}
>  };
>  MODULE_DEVICE_TABLE(pci, pciidlist);
> -- 
> 2.24.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 02/10] drm/i915: prefer 3-letter acronym for pineview

[Matt Roper]

On Mon, Dec 23, 2019 at 09:32:36AM -0800, Lucas De Marchi wrote:
> 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 pineview to pnv where appropriate.

Do you also want to convert watermark stuff in intel_pm.c like
pineview_display_wm, PINEVIEW_DISPLAY_FIFO, PINEVIEW_MAX_WM, etc.?


Matt

> 
> 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>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 8 ++++----
>  drivers/gpu/drm/i915/intel_pm.c              | 4 ++--
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 1860da0a493e..5d43024f35aa 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -369,7 +369,7 @@ static const struct intel_limit intel_limits_g4x_dual_channel_lvds = {
>  	},
>  };
>  
> -static const struct intel_limit intel_limits_pineview_sdvo = {
> +static const struct intel_limit pnv_limits_sdvo = {
>  	.dot = { .min = 20000, .max = 400000},
>  	.vco = { .min = 1700000, .max = 3500000 },
>  	/* Pineview's Ncounter is a ring counter */
> @@ -384,7 +384,7 @@ static const struct intel_limit intel_limits_pineview_sdvo = {
>  		.p2_slow = 10, .p2_fast = 5 },
>  };
>  
> -static const struct intel_limit intel_limits_pineview_lvds = {
> +static const struct intel_limit pnv_limits_lvds = {
>  	.dot = { .min = 20000, .max = 400000 },
>  	.vco = { .min = 1700000, .max = 3500000 },
>  	.n = { .min = 3, .max = 6 },
> @@ -8795,9 +8795,9 @@ static int pnv_crtc_compute_clock(struct intel_crtc *crtc,
>  			DRM_DEBUG_KMS("using SSC reference clock of %d kHz\n", refclk);
>  		}
>  
> -		limit = &intel_limits_pineview_lvds;
> +		limit = &pnv_limits_lvds;
>  	} else {
> -		limit = &intel_limits_pineview_sdvo;
> +		limit = &pnv_limits_sdvo;
>  	}
>  
>  	if (!crtc_state->clock_set &&
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 31ec82337e4f..eab3b029e98a 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -140,7 +140,7 @@ static void glk_init_clock_gating(struct drm_i915_private *dev_priv)
>  
>  }
>  
> -static void i915_pineview_get_mem_freq(struct drm_i915_private *dev_priv)
> +static void pnv_get_mem_freq(struct drm_i915_private *dev_priv)
>  {
>  	u32 tmp;
>  
> @@ -7180,7 +7180,7 @@ void intel_init_pm(struct drm_i915_private *dev_priv)
>  {
>  	/* For cxsr */
>  	if (IS_PINEVIEW(dev_priv))
> -		i915_pineview_get_mem_freq(dev_priv);
> +		pnv_get_mem_freq(dev_priv);
>  	else if (IS_GEN(dev_priv, 5))
>  		i915_ironlake_get_mem_freq(dev_priv);
>  
> -- 
> 2.24.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 03/10] drm/i915: prefer 3-letter acronym for haswell

[Matt Roper]

On Mon, Dec 23, 2019 at 09:32:37AM -0800, Lucas De Marchi wrote:
> 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 haswell to hsw 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>

> ---
>  drivers/gpu/drm/i915/display/intel_ddi.c     |  4 +-
>  drivers/gpu/drm/i915/display/intel_display.c | 57 ++++++++++----------
>  drivers/gpu/drm/i915/intel_device_info.c     |  4 +-
>  3 files changed, 32 insertions(+), 33 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index c9ba7d7f3787..d687c9503025 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -3458,14 +3458,14 @@ static void tgl_ddi_pre_enable_dp(struct intel_encoder *encoder,
>  	 * (DFLEXDPSP.DPX4TXLATC)
>  	 *
>  	 * This was done before tgl_ddi_pre_enable_dp by
> -	 * haswell_crtc_enable()->intel_encoders_pre_pll_enable().
> +	 * hsw_crtc_enable()->intel_encoders_pre_pll_enable().
>  	 */
>  
>  	/*
>  	 * 4. Enable the port PLL.
>  	 *
>  	 * The PLL enabling itself was already done before this function by
> -	 * haswell_crtc_enable()->intel_enable_shared_dpll().  We need only
> +	 * hsw_crtc_enable()->intel_enable_shared_dpll().  We need only
>  	 * configure the PLL to port mapping here.
>  	 */
>  	intel_ddi_clk_select(encoder, crtc_state);
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 5d43024f35aa..14726a293171 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -158,7 +158,7 @@ static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_sta
>  					 const struct intel_link_m_n *m2_n2);
>  static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state);
>  static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state);
> -static void haswell_set_pipeconf(const struct intel_crtc_state *crtc_state);
> +static void hsw_set_pipeconf(const struct intel_crtc_state *crtc_state);
>  static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state);
>  static void vlv_prepare_pll(struct intel_crtc *crtc,
>  			    const struct intel_crtc_state *pipe_config);
> @@ -6787,8 +6787,8 @@ static void hsw_set_frame_start_delay(const struct intel_crtc_state *crtc_state)
>  	I915_WRITE(reg, val);
>  }
>  
> -static void haswell_crtc_enable(struct intel_atomic_state *state,
> -				struct intel_crtc *crtc)
> +static void hsw_crtc_enable(struct intel_atomic_state *state,
> +			    struct intel_crtc *crtc)
>  {
>  	const struct intel_crtc_state *new_crtc_state =
>  		intel_atomic_get_new_crtc_state(state, crtc);
> @@ -6829,7 +6829,7 @@ static void haswell_crtc_enable(struct intel_atomic_state *state,
>  
>  	if (!transcoder_is_dsi(cpu_transcoder)) {
>  		hsw_set_frame_start_delay(new_crtc_state);
> -		haswell_set_pipeconf(new_crtc_state);
> +		hsw_set_pipeconf(new_crtc_state);
>  	}
>  
>  	if (INTEL_GEN(dev_priv) >= 9 || IS_BROADWELL(dev_priv))
> @@ -6967,8 +6967,8 @@ static void ironlake_crtc_disable(struct intel_atomic_state *state,
>  	intel_set_pch_fifo_underrun_reporting(dev_priv, pipe, true);
>  }
>  
> -static void haswell_crtc_disable(struct intel_atomic_state *state,
> -				 struct intel_crtc *crtc)
> +static void hsw_crtc_disable(struct intel_atomic_state *state,
> +			     struct intel_crtc *crtc)
>  {
>  	/*
>  	 * FIXME collapse everything to one hook.
> @@ -9783,7 +9783,7 @@ static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state)
>  	POSTING_READ(PIPECONF(pipe));
>  }
>  
> -static void haswell_set_pipeconf(const struct intel_crtc_state *crtc_state)
> +static void hsw_set_pipeconf(const struct intel_crtc_state *crtc_state)
>  {
>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> @@ -10417,8 +10417,9 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
>  
>  	return ret;
>  }
> -static int haswell_crtc_compute_clock(struct intel_crtc *crtc,
> -				      struct intel_crtc_state *crtc_state)
> +
> +static int hsw_crtc_compute_clock(struct intel_crtc *crtc,
> +				  struct intel_crtc_state *crtc_state)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>  	struct intel_atomic_state *state =
> @@ -10532,9 +10533,8 @@ static void skylake_get_ddi_pll(struct drm_i915_private *dev_priv,
>  	pipe_config->shared_dpll = intel_get_shared_dpll_by_id(dev_priv, id);
>  }
>  
> -static void haswell_get_ddi_pll(struct drm_i915_private *dev_priv,
> -				enum port port,
> -				struct intel_crtc_state *pipe_config)
> +static void hsw_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
> +			    struct intel_crtc_state *pipe_config)
>  {
>  	enum intel_dpll_id id;
>  	u32 ddi_pll_sel = I915_READ(PORT_CLK_SEL(port));
> @@ -10722,8 +10722,8 @@ static bool bxt_get_dsi_transcoder_state(struct intel_crtc *crtc,
>  	return transcoder_is_dsi(pipe_config->cpu_transcoder);
>  }
>  
> -static void haswell_get_ddi_port_state(struct intel_crtc *crtc,
> -				       struct intel_crtc_state *pipe_config)
> +static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
> +				   struct intel_crtc_state *pipe_config)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>  	enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
> @@ -10751,7 +10751,7 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc,
>  	else if (IS_GEN9_LP(dev_priv))
>  		bxt_get_ddi_pll(dev_priv, port, pipe_config);
>  	else
> -		haswell_get_ddi_pll(dev_priv, port, pipe_config);
> +		hsw_get_ddi_pll(dev_priv, port, pipe_config);
>  
>  	pll = pipe_config->shared_dpll;
>  	if (pll) {
> @@ -10829,8 +10829,8 @@ static void icelake_get_trans_port_sync_config(struct intel_crtc_state *crtc_sta
>  		crtc_state->sync_mode_slaves_mask);
>  }
>  
> -static bool haswell_get_pipe_config(struct intel_crtc *crtc,
> -				    struct intel_crtc_state *pipe_config)
> +static bool hsw_get_pipe_config(struct intel_crtc *crtc,
> +				struct intel_crtc_state *pipe_config)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>  	intel_wakeref_t wakerefs[POWER_DOMAIN_NUM], wf;
> @@ -10865,7 +10865,7 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
>  
>  	if (!transcoder_is_dsi(pipe_config->cpu_transcoder) ||
>  	    INTEL_GEN(dev_priv) >= 11) {
> -		haswell_get_ddi_port_state(crtc, pipe_config);
> +		hsw_get_ddi_port_state(crtc, pipe_config);
>  		intel_get_pipe_timings(crtc, pipe_config);
>  	}
>  
> @@ -14048,7 +14048,7 @@ static void intel_modeset_clear_plls(struct intel_atomic_state *state)
>   * multiple pipes, and planes are enabled after the pipe, we need to wait at
>   * least 2 vblanks on the first pipe before enabling planes on the second pipe.
>   */
> -static int haswell_mode_set_planes_workaround(struct intel_atomic_state *state)
> +static int hsw_mode_set_planes_workaround(struct intel_atomic_state *state)
>  {
>  	struct intel_crtc_state *crtc_state;
>  	struct intel_crtc *crtc;
> @@ -14143,7 +14143,7 @@ static int intel_modeset_checks(struct intel_atomic_state *state)
>  	intel_modeset_clear_plls(state);
>  
>  	if (IS_HASWELL(dev_priv))
> -		return haswell_mode_set_planes_workaround(state);
> +		return hsw_mode_set_planes_workaround(state);
>  
>  	return 0;
>  }
> @@ -16814,21 +16814,20 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
>  	intel_init_cdclk_hooks(dev_priv);
>  
>  	if (INTEL_GEN(dev_priv) >= 9) {
> -		dev_priv->display.get_pipe_config = haswell_get_pipe_config;
> +		dev_priv->display.get_pipe_config = hsw_get_pipe_config;
>  		dev_priv->display.get_initial_plane_config =
>  			skylake_get_initial_plane_config;
> -		dev_priv->display.crtc_compute_clock =
> -			haswell_crtc_compute_clock;
> -		dev_priv->display.crtc_enable = haswell_crtc_enable;
> -		dev_priv->display.crtc_disable = haswell_crtc_disable;
> +		dev_priv->display.crtc_compute_clock = hsw_crtc_compute_clock;
> +		dev_priv->display.crtc_enable = hsw_crtc_enable;
> +		dev_priv->display.crtc_disable = hsw_crtc_disable;
>  	} else if (HAS_DDI(dev_priv)) {
> -		dev_priv->display.get_pipe_config = haswell_get_pipe_config;
> +		dev_priv->display.get_pipe_config = hsw_get_pipe_config;
>  		dev_priv->display.get_initial_plane_config =
>  			i9xx_get_initial_plane_config;
>  		dev_priv->display.crtc_compute_clock =
> -			haswell_crtc_compute_clock;
> -		dev_priv->display.crtc_enable = haswell_crtc_enable;
> -		dev_priv->display.crtc_disable = haswell_crtc_disable;
> +			hsw_crtc_compute_clock;
> +		dev_priv->display.crtc_enable = hsw_crtc_enable;
> +		dev_priv->display.crtc_disable = hsw_crtc_disable;
>  	} else if (HAS_PCH_SPLIT(dev_priv)) {
>  		dev_priv->display.get_pipe_config = ironlake_get_pipe_config;
>  		dev_priv->display.get_initial_plane_config =
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index 1acb5db77431..ca7a42e1d769 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -600,7 +600,7 @@ static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv)
>  	sseu->has_eu_pg = 0;
>  }
>  
> -static void haswell_sseu_info_init(struct drm_i915_private *dev_priv)
> +static void hsw_sseu_info_init(struct drm_i915_private *dev_priv)
>  {
>  	struct sseu_dev_info *sseu = &RUNTIME_INFO(dev_priv)->sseu;
>  	u32 fuse1;
> @@ -1021,7 +1021,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
>  
>  	/* Initialize slice/subslice/EU info */
>  	if (IS_HASWELL(dev_priv))
> -		haswell_sseu_info_init(dev_priv);
> +		hsw_sseu_info_init(dev_priv);
>  	else if (IS_CHERRYVIEW(dev_priv))
>  		cherryview_sseu_info_init(dev_priv);
>  	else if (IS_BROADWELL(dev_priv))
> -- 
> 2.24.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 04/10] drm/i915: prefer 3-letter acronym for skylake

[Matt Roper]

On Mon, Dec 23, 2019 at 09:32:38AM -0800, Lucas De Marchi wrote:
> 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: 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>

> ---
>  drivers/gpu/drm/i915/display/icl_dsi.c       |  2 +-
>  drivers/gpu/drm/i915/display/intel_ddi.c     |  2 +-
>  drivers/gpu/drm/i915/display/intel_display.c | 29 ++++++++++----------
>  drivers/gpu/drm/i915/display/intel_display.h |  2 +-
>  drivers/gpu/drm/i915/display/intel_dp_mst.c  |  2 +-
>  drivers/gpu/drm/i915/display/vlv_dsi.c       |  2 +-
>  drivers/gpu/drm/i915/gt/intel_mocs.c         |  6 ++--
>  7 files changed, 22 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
> index 006b1a297e6f..8435bc5a7a74 100644
> --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> @@ -1259,7 +1259,7 @@ static void gen11_dsi_post_disable(struct intel_encoder *encoder,
>  
>  	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,
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index d687c9503025..b52c31721755 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -3896,7 +3896,7 @@ static void intel_ddi_post_disable(struct intel_encoder *encoder,
>  	intel_dsc_disable(old_crtc_state);
>  
>  	if (INTEL_GEN(dev_priv) >= 9)
> -		skylake_scaler_disable(old_crtc_state);
> +		skl_scaler_disable(old_crtc_state);
>  	else
>  		ironlake_pfit_disable(old_crtc_state);
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 14726a293171..18ac15df91c7 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -164,7 +164,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
>  			    const struct intel_crtc_state *pipe_config);
>  static void chv_prepare_pll(struct intel_crtc *crtc,
>  			    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 intel_modeset_setup_hw_state(struct drm_device *dev,
>  					 struct drm_modeset_acquire_ctx *ctx);
> @@ -6001,7 +6001,7 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
>  	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);
>  	int i;
> @@ -6010,7 +6010,7 @@ void skylake_scaler_disable(const struct intel_crtc_state *old_crtc_state)
>  		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 drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> @@ -6844,7 +6844,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
>  		glk_pipe_scaler_clock_gating_wa(dev_priv, pipe, true);
>  
>  	if (INTEL_GEN(dev_priv) >= 9)
> -		skylake_pfit_enable(new_crtc_state);
> +		skl_pfit_enable(new_crtc_state);
>  	else
>  		ironlake_pfit_enable(new_crtc_state);
>  
> @@ -10116,8 +10116,8 @@ static void ironlake_get_fdi_m_n_config(struct intel_crtc *crtc,
>  				     &pipe_config->fdi_m_n, NULL);
>  }
>  
> -static void skylake_get_pfit_config(struct intel_crtc *crtc,
> -				    struct intel_crtc_state *pipe_config)
> +static void skl_get_pfit_config(struct intel_crtc *crtc,
> +				struct intel_crtc_state *pipe_config)
>  {
>  	struct drm_device *dev = crtc->base.dev;
>  	struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -10148,8 +10148,8 @@ static void skylake_get_pfit_config(struct intel_crtc *crtc,
>  }
>  
>  static void
> -skylake_get_initial_plane_config(struct intel_crtc *crtc,
> -				 struct intel_initial_plane_config *plane_config)
> +skl_get_initial_plane_config(struct intel_crtc *crtc,
> +			     struct intel_initial_plane_config *plane_config)
>  {
>  	struct drm_device *dev = crtc->base.dev;
>  	struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -10517,9 +10517,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);
>  }
>  
> -static void skylake_get_ddi_pll(struct drm_i915_private *dev_priv,
> -				enum port port,
> -				struct intel_crtc_state *pipe_config)
> +static void skl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
> +			    struct intel_crtc_state *pipe_config)
>  {
>  	enum intel_dpll_id id;
>  	u32 temp;
> @@ -10747,7 +10746,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
>  	else if (IS_CANNONLAKE(dev_priv))
>  		cannonlake_get_ddi_pll(dev_priv, port, pipe_config);
>  	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))
>  		bxt_get_ddi_pll(dev_priv, port, pipe_config);
>  	else
> @@ -10922,7 +10921,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
>  		power_domain_mask |= BIT_ULL(power_domain);
>  
>  		if (INTEL_GEN(dev_priv) >= 9)
> -			skylake_get_pfit_config(crtc, pipe_config);
> +			skl_get_pfit_config(crtc, pipe_config);
>  		else
>  			ironlake_get_pfit_config(crtc, pipe_config);
>  	}
> @@ -14472,7 +14471,7 @@ static void intel_pipe_fastset(const struct intel_crtc_state *old_crtc_state,
>  		skl_detach_scalers(new_crtc_state);
>  
>  		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)) {
>  		if (new_crtc_state->pch_pfit.enabled)
>  			ironlake_pfit_enable(new_crtc_state);
> @@ -16816,7 +16815,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
>  	if (INTEL_GEN(dev_priv) >= 9) {
>  		dev_priv->display.get_pipe_config = hsw_get_pipe_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_enable = hsw_crtc_enable;
>  		dev_priv->display.crtc_disable = hsw_crtc_disable;
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index 0fef9263cddc..921a584c3284 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -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);
>  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);
>  u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
>  			const struct intel_plane_state *plane_state);
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index 7aa0975c33b7..01b4608ab56c 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -248,7 +248,7 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,
>  	intel_ddi_disable_transcoder_func(old_crtc_state);
>  
>  	if (INTEL_GEN(dev_priv) >= 9)
> -		skylake_scaler_disable(old_crtc_state);
> +		skl_scaler_disable(old_crtc_state);
>  	else
>  		ironlake_pfit_disable(old_crtc_state);
>  
> diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
> index 21e820299107..70ab378803c4 100644
> --- a/drivers/gpu/drm/i915/display/vlv_dsi.c
> +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
> @@ -895,7 +895,7 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder,
>  	if (IS_GEN9_LP(dev_priv)) {
>  		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)) {
> diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
> index 893249ea48d4..cbdeda608359 100644
> --- a/drivers/gpu/drm/i915/gt/intel_mocs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
> @@ -127,7 +127,7 @@ struct drm_i915_mocs_table {
>  		   LE_0_PAGETABLE | LE_TC_2_LLC_ELLC | LE_LRUM(3), \
>  		   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,
>  	MOCS_ENTRY(I915_MOCS_CACHED,
>  		   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,
>  		table->table = icelake_mocs_table;
>  		table->n_entries = GEN11_NUM_MOCS_ENTRIES;
>  	} 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->table = skylake_mocs_table;
> +		table->table = skl_mocs_table;
>  	} else if (IS_GEN9_LP(i915)) {
>  		table->size  = ARRAY_SIZE(broxton_mocs_table);
>  		table->n_entries = GEN9_NUM_MOCS_ENTRIES;
> -- 
> 2.24.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 05/10] drm/i915: prefer 3-letter acronym for cannonlake

[Matt Roper]

On Mon, Dec 23, 2019 at 09:32:39AM -0800, Lucas De Marchi wrote:
> 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 cannonlake to cnl where appropriate.

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>

> 
> 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>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 18ac15df91c7..98d6bcb4c761 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -10440,9 +10440,8 @@ static int hsw_crtc_compute_clock(struct intel_crtc *crtc,
>  	return 0;
>  }
>  
> -static void cannonlake_get_ddi_pll(struct drm_i915_private *dev_priv,
> -				   enum port port,
> -				   struct intel_crtc_state *pipe_config)
> +static void cnl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
> +			    struct intel_crtc_state *pipe_config)
>  {
>  	enum intel_dpll_id id;
>  	u32 temp;
> @@ -10744,7 +10743,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
>  	if (INTEL_GEN(dev_priv) >= 11)
>  		icelake_get_ddi_pll(dev_priv, port, pipe_config);
>  	else if (IS_CANNONLAKE(dev_priv))
> -		cannonlake_get_ddi_pll(dev_priv, port, pipe_config);
> +		cnl_get_ddi_pll(dev_priv, port, pipe_config);
>  	else if (IS_GEN9_BC(dev_priv))
>  		skl_get_ddi_pll(dev_priv, port, pipe_config);
>  	else if (IS_GEN9_LP(dev_priv))
> -- 
> 2.24.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 06/10] drm/i915: prefer 3-letter acronym for icelake

[Matt Roper]

On Mon, Dec 23, 2019 at 09:32:40AM -0800, Lucas De Marchi wrote:
> 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 icelake to icl 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>

> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 11 +++++------
>  drivers/gpu/drm/i915/gt/intel_mocs.c         |  6 +++---
>  2 files changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 98d6bcb4c761..461691cc2f62 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -10455,9 +10455,8 @@ static void cnl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
>  	pipe_config->shared_dpll = intel_get_shared_dpll_by_id(dev_priv, id);
>  }
>  
> -static void icelake_get_ddi_pll(struct drm_i915_private *dev_priv,
> -				enum port port,
> -				struct intel_crtc_state *pipe_config)
> +static void icl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,
> +			    struct intel_crtc_state *pipe_config)
>  {
>  	enum phy phy = intel_port_to_phy(dev_priv, port);
>  	enum icl_port_dpll_id port_dpll_id;
> @@ -10741,7 +10740,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
>  	}
>  
>  	if (INTEL_GEN(dev_priv) >= 11)
> -		icelake_get_ddi_pll(dev_priv, port, pipe_config);
> +		icl_get_ddi_pll(dev_priv, port, pipe_config);
>  	else if (IS_CANNONLAKE(dev_priv))
>  		cnl_get_ddi_pll(dev_priv, port, pipe_config);
>  	else if (IS_GEN9_BC(dev_priv))
> @@ -10792,7 +10791,7 @@ static enum transcoder transcoder_master_readout(struct drm_i915_private *dev_pr
>  		return master_select - 1;
>  }
>  
> -static void icelake_get_trans_port_sync_config(struct intel_crtc_state *crtc_state)
> +static void icl_get_trans_port_sync_config(struct intel_crtc_state *crtc_state)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
>  	u32 transcoders;
> @@ -10948,7 +10947,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
>  
>  	if (INTEL_GEN(dev_priv) >= 11 &&
>  	    !transcoder_is_dsi(pipe_config->cpu_transcoder))
> -		icelake_get_trans_port_sync_config(pipe_config);
> +		icl_get_trans_port_sync_config(pipe_config);
>  
>  out:
>  	for_each_power_domain(power_domain, power_domain_mask)
> diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
> index cbdeda608359..95f1bc45953b 100644
> --- a/drivers/gpu/drm/i915/gt/intel_mocs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
> @@ -267,7 +267,7 @@ static const struct drm_i915_mocs_entry tigerlake_mocs_table[] = {
>  		   L3_3_WB),
>  };
>  
> -static const struct drm_i915_mocs_entry icelake_mocs_table[] = {
> +static const struct drm_i915_mocs_entry icl_mocs_table[] = {
>  	/* Base - Uncached (Deprecated) */
>  	MOCS_ENTRY(I915_MOCS_UNCACHED,
>  		   LE_1_UC | LE_TC_1_LLC,
> @@ -288,8 +288,8 @@ static bool get_mocs_settings(const struct drm_i915_private *i915,
>  		table->table = tigerlake_mocs_table;
>  		table->n_entries = GEN11_NUM_MOCS_ENTRIES;
>  	} else if (IS_GEN(i915, 11)) {
> -		table->size  = ARRAY_SIZE(icelake_mocs_table);
> -		table->table = icelake_mocs_table;
> +		table->size  = ARRAY_SIZE(icl_mocs_table);
> +		table->table = icl_mocs_table;
>  		table->n_entries = GEN11_NUM_MOCS_ENTRIES;
>  	} else if (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915)) {
>  		table->size  = ARRAY_SIZE(skl_mocs_table);
> -- 
> 2.24.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 07/10] drm/i915: prefer 3-letter acronym for ironlake

[Matt Roper]

On Mon, Dec 23, 2019 at 09:32:41AM -0800, Lucas De Marchi wrote:
> 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.

DP_SCRAMBLING_DISABLE_IRONLAKE could be shortened, but afaics it's never
used anywhere so you might as well just remove it.

It can also be removed from the gma500 driver too.  :-)


Matt

> 
> 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>
> ---
>  drivers/gpu/drm/i915/display/intel_crt.c      |   8 +-
>  drivers/gpu/drm/i915/display/intel_ddi.c      |   2 +-
>  drivers/gpu/drm/i915/display/intel_display.c  | 168 +++++++++---------
>  drivers/gpu/drm/i915/display/intel_display.h  |   4 +-
>  drivers/gpu/drm/i915/display/intel_dp.c       |  34 ++--
>  drivers/gpu/drm/i915/display/intel_dp_mst.c   |   2 +-
>  .../drm/i915/display/intel_fifo_underrun.c    |   6 +-
>  drivers/gpu/drm/i915/gt/intel_reset.c         |   7 +-
>  drivers/gpu/drm/i915/i915_debugfs.c           |   4 +-
>  drivers/gpu/drm/i915/i915_irq.c               |  12 +-
>  drivers/gpu/drm/i915/intel_pm.c               |   4 +-
>  11 files changed, 125 insertions(+), 126 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
> index b2b1336ecdb6..cbe5978e7fb5 100644
> --- a/drivers/gpu/drm/i915/display/intel_crt.c
> +++ b/drivers/gpu/drm/i915/display/intel_crt.c
> @@ -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);
>  
> @@ -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 */
> @@ -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);
> @@ -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);
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index b52c31721755..62fa73815d8a 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -3898,7 +3898,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:
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 461691cc2f62..5093fd08f381 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -145,8 +145,8 @@ static const u64 cursor_format_modifiers[] = {
>  
>  static void i9xx_crtc_clock_get(struct intel_crtc *crtc,
>  				struct intel_crtc_state *pipe_config);
> -static void ironlake_pch_clock_get(struct intel_crtc *crtc,
> -				   struct intel_crtc_state *pipe_config);
> +static void ilk_pch_clock_get(struct intel_crtc *crtc,
> +			      struct intel_crtc_state *pipe_config);
>  
>  static int intel_framebuffer_init(struct intel_framebuffer *ifb,
>  				  struct drm_i915_gem_object *obj,
> @@ -157,7 +157,7 @@ static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_sta
>  					 const struct intel_link_m_n *m_n,
>  					 const struct intel_link_m_n *m2_n2);
>  static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state);
> -static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state);
> +static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state);
>  static void hsw_set_pipeconf(const struct intel_crtc_state *crtc_state);
>  static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state);
>  static void vlv_prepare_pll(struct intel_crtc *crtc,
> @@ -165,7 +165,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
>  static void chv_prepare_pll(struct intel_crtc *crtc,
>  			    const struct intel_crtc_state *pipe_config);
>  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 ilk_pfit_enable(const struct intel_crtc_state *crtc_state);
>  static void intel_modeset_setup_hw_state(struct drm_device *dev,
>  					 struct drm_modeset_acquire_ctx *ctx);
>  static struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc);
> @@ -402,7 +402,7 @@ static const struct intel_limit pnv_limits_lvds = {
>   * We calculate clock using (register_value + 2) for N/M1/M2, so here
>   * the range value for them is (actual_value - 2).
>   */
> -static const struct intel_limit intel_limits_ironlake_dac = {
> +static const struct intel_limit ilk_limits_dac = {
>  	.dot = { .min = 25000, .max = 350000 },
>  	.vco = { .min = 1760000, .max = 3510000 },
>  	.n = { .min = 1, .max = 5 },
> @@ -415,7 +415,7 @@ static const struct intel_limit intel_limits_ironlake_dac = {
>  		.p2_slow = 10, .p2_fast = 5 },
>  };
>  
> -static const struct intel_limit intel_limits_ironlake_single_lvds = {
> +static const struct intel_limit ilk_limits_single_lvds = {
>  	.dot = { .min = 25000, .max = 350000 },
>  	.vco = { .min = 1760000, .max = 3510000 },
>  	.n = { .min = 1, .max = 3 },
> @@ -428,7 +428,7 @@ static const struct intel_limit intel_limits_ironlake_single_lvds = {
>  		.p2_slow = 14, .p2_fast = 14 },
>  };
>  
> -static const struct intel_limit intel_limits_ironlake_dual_lvds = {
> +static const struct intel_limit ilk_limits_dual_lvds = {
>  	.dot = { .min = 25000, .max = 350000 },
>  	.vco = { .min = 1760000, .max = 3510000 },
>  	.n = { .min = 1, .max = 3 },
> @@ -442,7 +442,7 @@ static const struct intel_limit intel_limits_ironlake_dual_lvds = {
>  };
>  
>  /* LVDS 100mhz refclk limits. */
> -static const struct intel_limit intel_limits_ironlake_single_lvds_100m = {
> +static const struct intel_limit ilk_limits_single_lvds_100m = {
>  	.dot = { .min = 25000, .max = 350000 },
>  	.vco = { .min = 1760000, .max = 3510000 },
>  	.n = { .min = 1, .max = 2 },
> @@ -455,7 +455,7 @@ static const struct intel_limit intel_limits_ironlake_single_lvds_100m = {
>  		.p2_slow = 14, .p2_fast = 14 },
>  };
>  
> -static const struct intel_limit intel_limits_ironlake_dual_lvds_100m = {
> +static const struct intel_limit ilk_limits_dual_lvds_100m = {
>  	.dot = { .min = 25000, .max = 350000 },
>  	.vco = { .min = 1760000, .max = 3510000 },
>  	.n = { .min = 1, .max = 3 },
> @@ -1637,7 +1637,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
>  		     I915_READ(dpll_reg) & port_mask, expected_mask);
>  }
>  
> -static void ironlake_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)
> +static void ilk_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)
>  {
>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> @@ -1735,8 +1735,8 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv,
>  		DRM_ERROR("Failed to enable PCH transcoder\n");
>  }
>  
> -static void ironlake_disable_pch_transcoder(struct drm_i915_private *dev_priv,
> -					    enum pipe pipe)
> +static void ilk_disable_pch_transcoder(struct drm_i915_private *dev_priv,
> +				       enum pipe pipe)
>  {
>  	i915_reg_t reg;
>  	u32 val;
> @@ -4869,8 +4869,8 @@ static void intel_fdi_normal_train(struct intel_crtc *crtc)
>  }
>  
>  /* The FDI link training functions for ILK/Ibexpeak. */
> -static void ironlake_fdi_link_train(struct intel_crtc *crtc,
> -				    const struct intel_crtc_state *crtc_state)
> +static void ilk_fdi_link_train(struct intel_crtc *crtc,
> +			       const struct intel_crtc_state *crtc_state)
>  {
>  	struct drm_device *dev = crtc->base.dev;
>  	struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -5222,7 +5222,7 @@ static void ivb_manual_fdi_link_train(struct intel_crtc *crtc,
>  	DRM_DEBUG_KMS("FDI train done.\n");
>  }
>  
> -static void ironlake_fdi_pll_enable(const struct intel_crtc_state *crtc_state)
> +static void ilk_fdi_pll_enable(const struct intel_crtc_state *crtc_state)
>  {
>  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->uapi.crtc);
>  	struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev);
> @@ -5259,7 +5259,7 @@ static void ironlake_fdi_pll_enable(const struct intel_crtc_state *crtc_state)
>  	}
>  }
>  
> -static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc)
> +static void ilk_fdi_pll_disable(struct intel_crtc *intel_crtc)
>  {
>  	struct drm_device *dev = intel_crtc->base.dev;
>  	struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -5289,7 +5289,7 @@ static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc)
>  	udelay(100);
>  }
>  
> -static void ironlake_fdi_disable(struct intel_crtc *crtc)
> +static void ilk_fdi_disable(struct intel_crtc *crtc)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>  	enum pipe pipe = crtc->pipe;
> @@ -5496,8 +5496,8 @@ int lpt_get_iclkip(struct drm_i915_private *dev_priv)
>  				 desired_divisor << auxdiv);
>  }
>  
> -static void ironlake_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_state,
> -						enum pipe pch_transcoder)
> +static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_state,
> +					   enum pipe pch_transcoder)
>  {
>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> @@ -5601,8 +5601,8 @@ intel_get_crtc_new_encoder(const struct intel_atomic_state *state,
>   *   - DP transcoding bits
>   *   - transcoder
>   */
> -static void ironlake_pch_enable(const struct intel_atomic_state *state,
> -				const struct intel_crtc_state *crtc_state)
> +static void ilk_pch_enable(const struct intel_atomic_state *state,
> +			   const struct intel_crtc_state *crtc_state)
>  {
>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>  	struct drm_device *dev = crtc->base.dev;
> @@ -5650,7 +5650,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,
>  
>  	/* set transcoder timing, panel must allow it */
>  	assert_panel_unlocked(dev_priv, pipe);
> -	ironlake_pch_transcoder_set_timings(crtc_state, pipe);
> +	ilk_pch_transcoder_set_timings(crtc_state, pipe);
>  
>  	intel_fdi_normal_train(crtc);
>  
> @@ -5682,7 +5682,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,
>  		I915_WRITE(reg, temp);
>  	}
>  
> -	ironlake_enable_pch_transcoder(crtc_state);
> +	ilk_enable_pch_transcoder(crtc_state);
>  }
>  
>  static void lpt_pch_enable(const struct intel_atomic_state *state,
> @@ -5697,7 +5697,7 @@ static void lpt_pch_enable(const struct intel_atomic_state *state,
>  	lpt_program_iclkip(crtc_state);
>  
>  	/* Set transcoder timing. */
> -	ironlake_pch_transcoder_set_timings(crtc_state, PIPE_A);
> +	ilk_pch_transcoder_set_timings(crtc_state, PIPE_A);
>  
>  	lpt_enable_pch_transcoder(dev_priv, cpu_transcoder);
>  }
> @@ -6047,7 +6047,7 @@ 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 ilk_pfit_enable(const struct intel_crtc_state *crtc_state)
>  {
>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> @@ -6643,8 +6643,8 @@ static void intel_disable_primary_plane(const struct intel_crtc_state *crtc_stat
>  	plane->disable_plane(plane, crtc_state);
>  }
>  
> -static void ironlake_crtc_enable(struct intel_atomic_state *state,
> -				 struct intel_crtc *crtc)
> +static void ilk_crtc_enable(struct intel_atomic_state *state,
> +			    struct intel_crtc *crtc)
>  {
>  	const struct intel_crtc_state *new_crtc_state =
>  		intel_atomic_get_new_crtc_state(state, crtc);
> @@ -6680,7 +6680,7 @@ static void ironlake_crtc_enable(struct intel_atomic_state *state,
>  		intel_cpu_transcoder_set_m_n(new_crtc_state,
>  					     &new_crtc_state->fdi_m_n, NULL);
>  
> -	ironlake_set_pipeconf(new_crtc_state);
> +	ilk_set_pipeconf(new_crtc_state);
>  
>  	crtc->active = true;
>  
> @@ -6690,13 +6690,13 @@ static void ironlake_crtc_enable(struct intel_atomic_state *state,
>  		/* Note: FDI PLL enabling _must_ be done before we enable the
>  		 * cpu pipes, hence this is separate from all the other fdi/pch
>  		 * enabling. */
> -		ironlake_fdi_pll_enable(new_crtc_state);
> +		ilk_fdi_pll_enable(new_crtc_state);
>  	} else {
>  		assert_fdi_tx_disabled(dev_priv, pipe);
>  		assert_fdi_rx_disabled(dev_priv, pipe);
>  	}
>  
> -	ironlake_pfit_enable(new_crtc_state);
> +	ilk_pfit_enable(new_crtc_state);
>  
>  	/*
>  	 * On ILK+ LUT must be loaded before the pipe is running but with
> @@ -6712,7 +6712,7 @@ static void ironlake_crtc_enable(struct intel_atomic_state *state,
>  	intel_enable_pipe(new_crtc_state);
>  
>  	if (new_crtc_state->has_pch_encoder)
> -		ironlake_pch_enable(state, new_crtc_state);
> +		ilk_pch_enable(state, new_crtc_state);
>  
>  	intel_crtc_vblank_on(new_crtc_state);
>  
> @@ -6846,7 +6846,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
>  	if (INTEL_GEN(dev_priv) >= 9)
>  		skl_pfit_enable(new_crtc_state);
>  	else
> -		ironlake_pfit_enable(new_crtc_state);
> +		ilk_pfit_enable(new_crtc_state);
>  
>  	/*
>  	 * On ILK+ LUT must be loaded before the pipe is running but with
> @@ -6895,7 +6895,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
>  	}
>  }
>  
> -void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state)
> +void ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state)
>  {
>  	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> @@ -6910,8 +6910,8 @@ void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state)
>  	}
>  }
>  
> -static void ironlake_crtc_disable(struct intel_atomic_state *state,
> -				  struct intel_crtc *crtc)
> +static void ilk_crtc_disable(struct intel_atomic_state *state,
> +			     struct intel_crtc *crtc)
>  {
>  	const struct intel_crtc_state *old_crtc_state =
>  		intel_atomic_get_old_crtc_state(state, crtc);
> @@ -6932,15 +6932,15 @@ static void ironlake_crtc_disable(struct intel_atomic_state *state,
>  
>  	intel_disable_pipe(old_crtc_state);
>  
> -	ironlake_pfit_disable(old_crtc_state);
> +	ilk_pfit_disable(old_crtc_state);
>  
>  	if (old_crtc_state->has_pch_encoder)
> -		ironlake_fdi_disable(crtc);
> +		ilk_fdi_disable(crtc);
>  
>  	intel_encoders_post_disable(state, crtc);
>  
>  	if (old_crtc_state->has_pch_encoder) {
> -		ironlake_disable_pch_transcoder(dev_priv, pipe);
> +		ilk_disable_pch_transcoder(dev_priv, pipe);
>  
>  		if (HAS_PCH_CPT(dev_priv)) {
>  			i915_reg_t reg;
> @@ -6960,7 +6960,7 @@ static void ironlake_crtc_disable(struct intel_atomic_state *state,
>  			I915_WRITE(PCH_DPLL_SEL, temp);
>  		}
>  
> -		ironlake_fdi_pll_disable(crtc);
> +		ilk_fdi_pll_disable(crtc);
>  	}
>  
>  	intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, true);
> @@ -7505,8 +7505,8 @@ static int pipe_required_fdi_lanes(struct intel_crtc_state *crtc_state)
>  	return 0;
>  }
>  
> -static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
> -				     struct intel_crtc_state *pipe_config)
> +static int ilk_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
> +			       struct intel_crtc_state *pipe_config)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(dev);
>  	struct drm_atomic_state *state = pipe_config->uapi.state;
> @@ -7578,8 +7578,8 @@ static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
>  }
>  
>  #define RETRY 1
> -static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc,
> -				       struct intel_crtc_state *pipe_config)
> +static int ilk_fdi_compute_config(struct intel_crtc *intel_crtc,
> +				  struct intel_crtc_state *pipe_config)
>  {
>  	struct drm_device *dev = intel_crtc->base.dev;
>  	const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;
> @@ -7598,15 +7598,15 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc,
>  
>  	fdi_dotclock = adjusted_mode->crtc_clock;
>  
> -	lane = ironlake_get_lanes_required(fdi_dotclock, link_bw,
> -					   pipe_config->pipe_bpp);
> +	lane = ilk_get_lanes_required(fdi_dotclock, link_bw,
> +				      pipe_config->pipe_bpp);
>  
>  	pipe_config->fdi_lanes = lane;
>  
>  	intel_link_compute_m_n(pipe_config->pipe_bpp, lane, fdi_dotclock,
>  			       link_bw, &pipe_config->fdi_m_n, false, false);
>  
> -	ret = ironlake_check_fdi_lanes(dev, intel_crtc->pipe, pipe_config);
> +	ret = ilk_check_fdi_lanes(dev, intel_crtc->pipe, pipe_config);
>  	if (ret == -EDEADLK)
>  		return ret;
>  
> @@ -7812,7 +7812,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
>  	intel_crtc_compute_pixel_rate(pipe_config);
>  
>  	if (pipe_config->has_pch_encoder)
> -		return ironlake_fdi_compute_config(crtc, pipe_config);
> +		return ilk_fdi_compute_config(crtc, pipe_config);
>  
>  	return 0;
>  }
> @@ -9224,7 +9224,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
>  	return ret;
>  }
>  
> -static void ironlake_init_pch_refclk(struct drm_i915_private *dev_priv)
> +static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv)
>  {
>  	struct intel_encoder *encoder;
>  	int i;
> @@ -9722,12 +9722,12 @@ static void lpt_init_pch_refclk(struct drm_i915_private *dev_priv)
>  void intel_init_pch_refclk(struct drm_i915_private *dev_priv)
>  {
>  	if (HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv))
> -		ironlake_init_pch_refclk(dev_priv);
> +		ilk_init_pch_refclk(dev_priv);
>  	else if (HAS_PCH_LPT(dev_priv))
>  		lpt_init_pch_refclk(dev_priv);
>  }
>  
> -static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state)
> +static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state)
>  {
>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> @@ -9871,7 +9871,7 @@ int bdw_get_pipemisc_bpp(struct intel_crtc *crtc)
>  	}
>  }
>  
> -int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp)
> +int ilk_get_lanes_required(int target_clock, int link_bw, int bpp)
>  {
>  	/*
>  	 * Account for spread spectrum to avoid
> @@ -9882,14 +9882,14 @@ int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp)
>  	return DIV_ROUND_UP(bps, link_bw * 8);
>  }
>  
> -static bool ironlake_needs_fb_cb_tune(struct dpll *dpll, int factor)
> +static bool ilk_needs_fb_cb_tune(struct dpll *dpll, int factor)
>  {
>  	return i9xx_dpll_compute_m(dpll) < factor * dpll->n;
>  }
>  
> -static void ironlake_compute_dpll(struct intel_crtc *crtc,
> -				  struct intel_crtc_state *crtc_state,
> -				  struct dpll *reduced_clock)
> +static void ilk_compute_dpll(struct intel_crtc *crtc,
> +			     struct intel_crtc_state *crtc_state,
> +			     struct dpll *reduced_clock)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>  	u32 dpll, fp, fp2;
> @@ -9909,7 +9909,7 @@ static void ironlake_compute_dpll(struct intel_crtc *crtc,
>  
>  	fp = i9xx_dpll_compute_fp(&crtc_state->dpll);
>  
> -	if (ironlake_needs_fb_cb_tune(&crtc_state->dpll, factor))
> +	if (ilk_needs_fb_cb_tune(&crtc_state->dpll, factor))
>  		fp |= FP_CB_TUNE;
>  
>  	if (reduced_clock) {
> @@ -9989,8 +9989,8 @@ static void ironlake_compute_dpll(struct intel_crtc *crtc,
>  	crtc_state->dpll_hw_state.fp1 = fp2;
>  }
>  
> -static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
> -				       struct intel_crtc_state *crtc_state)
> +static int ilk_crtc_compute_clock(struct intel_crtc *crtc,
> +				  struct intel_crtc_state *crtc_state)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>  	struct intel_atomic_state *state =
> @@ -10014,17 +10014,17 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
>  
>  		if (intel_is_dual_link_lvds(dev_priv)) {
>  			if (refclk == 100000)
> -				limit = &intel_limits_ironlake_dual_lvds_100m;
> +				limit = &ilk_limits_dual_lvds_100m;
>  			else
> -				limit = &intel_limits_ironlake_dual_lvds;
> +				limit = &ilk_limits_dual_lvds;
>  		} else {
>  			if (refclk == 100000)
> -				limit = &intel_limits_ironlake_single_lvds_100m;
> +				limit = &ilk_limits_single_lvds_100m;
>  			else
> -				limit = &intel_limits_ironlake_single_lvds;
> +				limit = &ilk_limits_single_lvds;
>  		}
>  	} else {
> -		limit = &intel_limits_ironlake_dac;
> +		limit = &ilk_limits_dac;
>  	}
>  
>  	if (!crtc_state->clock_set &&
> @@ -10034,7 +10034,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
>  		return -EINVAL;
>  	}
>  
> -	ironlake_compute_dpll(crtc, crtc_state, NULL);
> +	ilk_compute_dpll(crtc, crtc_state, NULL);
>  
>  	if (!intel_reserve_shared_dplls(state, crtc, NULL)) {
>  		DRM_DEBUG_KMS("failed to find PLL for pipe %c\n",
> @@ -10109,8 +10109,8 @@ void intel_dp_get_m_n(struct intel_crtc *crtc,
>  					     &pipe_config->dp_m2_n2);
>  }
>  
> -static void ironlake_get_fdi_m_n_config(struct intel_crtc *crtc,
> -					struct intel_crtc_state *pipe_config)
> +static void ilk_get_fdi_m_n_config(struct intel_crtc *crtc,
> +				   struct intel_crtc_state *pipe_config)
>  {
>  	intel_cpu_transcoder_get_m_n(crtc, pipe_config->cpu_transcoder,
>  				     &pipe_config->fdi_m_n, NULL);
> @@ -10276,8 +10276,8 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
>  	kfree(intel_fb);
>  }
>  
> -static void ironlake_get_pfit_config(struct intel_crtc *crtc,
> -				     struct intel_crtc_state *pipe_config)
> +static void ilk_get_pfit_config(struct intel_crtc *crtc,
> +				struct intel_crtc_state *pipe_config)
>  {
>  	struct drm_device *dev = crtc->base.dev;
>  	struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -10300,8 +10300,8 @@ static void ironlake_get_pfit_config(struct intel_crtc *crtc,
>  	}
>  }
>  
> -static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
> -				     struct intel_crtc_state *pipe_config)
> +static bool ilk_get_pipe_config(struct intel_crtc *crtc,
> +				struct intel_crtc_state *pipe_config)
>  {
>  	struct drm_device *dev = crtc->base.dev;
>  	struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -10372,7 +10372,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
>  		pipe_config->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>
>  					  FDI_DP_PORT_WIDTH_SHIFT) + 1;
>  
> -		ironlake_get_fdi_m_n_config(crtc, pipe_config);
> +		ilk_get_fdi_m_n_config(crtc, pipe_config);
>  
>  		if (HAS_PCH_IBX(dev_priv)) {
>  			/*
> @@ -10400,7 +10400,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
>  			((tmp & PLL_REF_SDVO_HDMI_MULTIPLIER_MASK)
>  			 >> PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT) + 1;
>  
> -		ironlake_pch_clock_get(crtc, pipe_config);
> +		ilk_pch_clock_get(crtc, pipe_config);
>  	} else {
>  		pipe_config->pixel_multiplier = 1;
>  	}
> @@ -10408,7 +10408,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
>  	intel_get_pipe_timings(crtc, pipe_config);
>  	intel_get_pipe_src_size(crtc, pipe_config);
>  
> -	ironlake_get_pfit_config(crtc, pipe_config);
> +	ilk_get_pfit_config(crtc, pipe_config);
>  
>  	ret = true;
>  
> @@ -10769,7 +10769,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
>  		pipe_config->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>
>  					  FDI_DP_PORT_WIDTH_SHIFT) + 1;
>  
> -		ironlake_get_fdi_m_n_config(crtc, pipe_config);
> +		ilk_get_fdi_m_n_config(crtc, pipe_config);
>  	}
>  }
>  
> @@ -10921,7 +10921,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
>  		if (INTEL_GEN(dev_priv) >= 9)
>  			skl_get_pfit_config(crtc, pipe_config);
>  		else
> -			ironlake_get_pfit_config(crtc, pipe_config);
> +			ilk_get_pfit_config(crtc, pipe_config);
>  	}
>  
>  	if (hsw_crtc_supports_ips(crtc)) {
> @@ -11864,8 +11864,8 @@ int intel_dotclock_calculate(int link_freq,
>  	return div_u64(mul_u32_u32(m_n->link_m, link_freq), m_n->link_n);
>  }
>  
> -static void ironlake_pch_clock_get(struct intel_crtc *crtc,
> -				   struct intel_crtc_state *pipe_config)
> +static void ilk_pch_clock_get(struct intel_crtc *crtc,
> +			      struct intel_crtc_state *pipe_config)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>  
> @@ -14472,9 +14472,9 @@ static void intel_pipe_fastset(const struct intel_crtc_state *old_crtc_state,
>  			skl_pfit_enable(new_crtc_state);
>  	} else if (HAS_PCH_SPLIT(dev_priv)) {
>  		if (new_crtc_state->pch_pfit.enabled)
> -			ironlake_pfit_enable(new_crtc_state);
> +			ilk_pfit_enable(new_crtc_state);
>  		else if (old_crtc_state->pch_pfit.enabled)
> -			ironlake_pfit_disable(old_crtc_state);
> +			ilk_pfit_disable(old_crtc_state);
>  	}
>  
>  	if (INTEL_GEN(dev_priv) >= 11)
> @@ -16826,13 +16826,13 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
>  		dev_priv->display.crtc_enable = hsw_crtc_enable;
>  		dev_priv->display.crtc_disable = hsw_crtc_disable;
>  	} else if (HAS_PCH_SPLIT(dev_priv)) {
> -		dev_priv->display.get_pipe_config = ironlake_get_pipe_config;
> +		dev_priv->display.get_pipe_config = ilk_get_pipe_config;
>  		dev_priv->display.get_initial_plane_config =
>  			i9xx_get_initial_plane_config;
>  		dev_priv->display.crtc_compute_clock =
> -			ironlake_crtc_compute_clock;
> -		dev_priv->display.crtc_enable = ironlake_crtc_enable;
> -		dev_priv->display.crtc_disable = ironlake_crtc_disable;
> +			ilk_crtc_compute_clock;
> +		dev_priv->display.crtc_enable = ilk_crtc_enable;
> +		dev_priv->display.crtc_disable = ilk_crtc_disable;
>  	} else if (IS_CHERRYVIEW(dev_priv)) {
>  		dev_priv->display.get_pipe_config = i9xx_get_pipe_config;
>  		dev_priv->display.get_initial_plane_config =
> @@ -16878,7 +16878,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
>  	}
>  
>  	if (IS_GEN(dev_priv, 5)) {
> -		dev_priv->display.fdi_link_train = ironlake_fdi_link_train;
> +		dev_priv->display.fdi_link_train = ilk_fdi_link_train;
>  	} else if (IS_GEN(dev_priv, 6)) {
>  		dev_priv->display.fdi_link_train = gen6_fdi_link_train;
>  	} else if (IS_IVYBRIDGE(dev_priv)) {
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index 921a584c3284..bc2c5104f755 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -521,7 +521,7 @@ int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data,
>  u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc);
>  void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state);
>  
> -int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp);
> +int ilk_get_lanes_required(int target_clock, int link_bw, int bpp);
>  void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
>  			 struct intel_digital_port *dport,
>  			 unsigned int expected_mask);
> @@ -579,7 +579,7 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
>  u16 skl_scaler_calc_phase(int sub, int scale, bool chroma_center);
>  int skl_update_scaler_crtc(struct intel_crtc_state *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 ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state);
>  u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
>  			const struct intel_plane_state *plane_state);
>  u32 glk_plane_color_ctl_crtc(const struct intel_crtc_state *crtc_state);
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 2f31d226c6eb..991f343579ef 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -2509,7 +2509,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,
>  	 *
>  	 * CPT PCH is quite different, having many bits moved
>  	 * to the TRANS_DP_CTL register instead. That
> -	 * configuration happens (oddly) in ironlake_pch_enable
> +	 * configuration happens (oddly) in ilk_pch_enable
>  	 */
>  
>  	/* Preserve the BIOS-computed detected bit. This is
> @@ -2653,7 +2653,7 @@ static void edp_wait_backlight_off(struct intel_dp *intel_dp)
>   * is locked
>   */
>  
> -static  u32 ironlake_get_pp_control(struct intel_dp *intel_dp)
> +static  u32 ilk_get_pp_control(struct intel_dp *intel_dp)
>  {
>  	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>  	u32 control;
> @@ -2703,7 +2703,7 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)
>  	if (!edp_have_panel_power(intel_dp))
>  		wait_panel_power_cycle(intel_dp);
>  
> -	pp = ironlake_get_pp_control(intel_dp);
> +	pp = ilk_get_pp_control(intel_dp);
>  	pp |= EDP_FORCE_VDD;
>  
>  	pp_stat_reg = _pp_stat_reg(intel_dp);
> @@ -2768,7 +2768,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)
>  		      intel_dig_port->base.base.base.id,
>  		      intel_dig_port->base.base.name);
>  
> -	pp = ironlake_get_pp_control(intel_dp);
> +	pp = ilk_get_pp_control(intel_dp);
>  	pp &= ~EDP_FORCE_VDD;
>  
>  	pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
> @@ -2864,7 +2864,7 @@ static void edp_panel_on(struct intel_dp *intel_dp)
>  	wait_panel_power_cycle(intel_dp);
>  
>  	pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
> -	pp = ironlake_get_pp_control(intel_dp);
> +	pp = ilk_get_pp_control(intel_dp);
>  	if (IS_GEN(dev_priv, 5)) {
>  		/* ILK workaround: disable reset around power sequence */
>  		pp &= ~PANEL_POWER_RESET;
> @@ -2919,7 +2919,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)
>  	WARN(!intel_dp->want_panel_vdd, "Need [ENCODER:%d:%s] VDD to turn off panel\n",
>  	     dig_port->base.base.base.id, dig_port->base.base.name);
>  
> -	pp = ironlake_get_pp_control(intel_dp);
> +	pp = ilk_get_pp_control(intel_dp);
>  	/* We need to switch off panel power _and_ force vdd, for otherwise some
>  	 * panels get very unhappy and cease to work. */
>  	pp &= ~(PANEL_POWER_ON | PANEL_POWER_RESET | EDP_FORCE_VDD |
> @@ -2968,7 +2968,7 @@ static void _intel_edp_backlight_on(struct intel_dp *intel_dp)
>  		i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
>  		u32 pp;
>  
> -		pp = ironlake_get_pp_control(intel_dp);
> +		pp = ilk_get_pp_control(intel_dp);
>  		pp |= EDP_BLC_ENABLE;
>  
>  		I915_WRITE(pp_ctrl_reg, pp);
> @@ -3004,7 +3004,7 @@ static void _intel_edp_backlight_off(struct intel_dp *intel_dp)
>  		i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
>  		u32 pp;
>  
> -		pp = ironlake_get_pp_control(intel_dp);
> +		pp = ilk_get_pp_control(intel_dp);
>  		pp &= ~EDP_BLC_ENABLE;
>  
>  		I915_WRITE(pp_ctrl_reg, pp);
> @@ -3042,7 +3042,7 @@ static void intel_edp_backlight_power(struct intel_connector *connector,
>  
>  	is_enabled = false;
>  	with_pps_lock(intel_dp, wakeref)
> -		is_enabled = ironlake_get_pp_control(intel_dp) & EDP_BLC_ENABLE;
> +		is_enabled = ilk_get_pp_control(intel_dp) & EDP_BLC_ENABLE;
>  	if (is_enabled == enable)
>  		return;
>  
> @@ -3079,8 +3079,8 @@ static void assert_edp_pll(struct drm_i915_private *dev_priv, bool state)
>  #define assert_edp_pll_enabled(d) assert_edp_pll((d), true)
>  #define assert_edp_pll_disabled(d) assert_edp_pll((d), false)
>  
> -static void ironlake_edp_pll_on(struct intel_dp *intel_dp,
> -				const struct intel_crtc_state *pipe_config)
> +static void ilk_edp_pll_on(struct intel_dp *intel_dp,
> +			   const struct intel_crtc_state *pipe_config)
>  {
>  	struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> @@ -3119,8 +3119,8 @@ static void ironlake_edp_pll_on(struct intel_dp *intel_dp,
>  	udelay(200);
>  }
>  
> -static void ironlake_edp_pll_off(struct intel_dp *intel_dp,
> -				 const struct intel_crtc_state *old_crtc_state)
> +static void ilk_edp_pll_off(struct intel_dp *intel_dp,
> +			    const struct intel_crtc_state *old_crtc_state)
>  {
>  	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> @@ -3410,7 +3410,7 @@ static void g4x_post_disable_dp(struct intel_encoder *encoder,
>  
>  	/* Only ilk+ has port A */
>  	if (port == PORT_A)
> -		ironlake_edp_pll_off(intel_dp, old_crtc_state);
> +		ilk_edp_pll_off(intel_dp, old_crtc_state);
>  }
>  
>  static void vlv_post_disable_dp(struct intel_encoder *encoder,
> @@ -3615,7 +3615,7 @@ static void g4x_pre_enable_dp(struct intel_encoder *encoder,
>  
>  	/* Only ilk+ has port A */
>  	if (port == PORT_A)
> -		ironlake_edp_pll_on(intel_dp, pipe_config);
> +		ilk_edp_pll_on(intel_dp, pipe_config);
>  }
>  
>  static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)
> @@ -6693,7 +6693,7 @@ intel_pps_readout_hw_state(struct intel_dp *intel_dp, struct edp_power_seq *seq)
>  
>  	intel_pps_get_registers(intel_dp, &regs);
>  
> -	pp_ctl = ironlake_get_pp_control(intel_dp);
> +	pp_ctl = ilk_get_pp_control(intel_dp);
>  
>  	/* Ensure PPS is unlocked */
>  	if (!HAS_DDI(dev_priv))
> @@ -6863,7 +6863,7 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp,
>  	 * soon as the new power sequencer gets initialized.
>  	 */
>  	if (force_disable_vdd) {
> -		u32 pp = ironlake_get_pp_control(intel_dp);
> +		u32 pp = ilk_get_pp_control(intel_dp);
>  
>  		WARN(pp & PANEL_POWER_ON, "Panel power already on\n");
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index 01b4608ab56c..cbf623154af1 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -250,7 +250,7 @@ static void intel_mst_post_disable_dp(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);
>  
>  	/*
>  	 * From TGL spec: "If multi-stream slave transcoder: Configure
> diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> index ab61f88d1d33..d6e0d0be842e 100644
> --- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> +++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> @@ -126,8 +126,8 @@ static void i9xx_set_fifo_underrun_reporting(struct drm_device *dev,
>  	}
>  }
>  
> -static void ironlake_set_fifo_underrun_reporting(struct drm_device *dev,
> -						 enum pipe pipe, bool enable)
> +static void ilk_set_fifo_underrun_reporting(struct drm_device *dev,
> +					    enum pipe pipe, bool enable)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(dev);
>  	u32 bit = (pipe == PIPE_A) ?
> @@ -264,7 +264,7 @@ static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev,
>  	if (HAS_GMCH(dev_priv))
>  		i9xx_set_fifo_underrun_reporting(dev, pipe, enable, old);
>  	else if (IS_GEN_RANGE(dev_priv, 5, 6))
> -		ironlake_set_fifo_underrun_reporting(dev, pipe, enable);
> +		ilk_set_fifo_underrun_reporting(dev, pipe, enable);
>  	else if (IS_GEN(dev_priv, 7))
>  		ivybridge_set_fifo_underrun_reporting(dev, pipe, enable, old);
>  	else if (INTEL_GEN(dev_priv) >= 8)
> diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
> index 1c51296646e0..ea7069e238d0 100644
> --- a/drivers/gpu/drm/i915/gt/intel_reset.c
> +++ b/drivers/gpu/drm/i915/gt/intel_reset.c
> @@ -251,9 +251,8 @@ static int g4x_do_reset(struct intel_gt *gt,
>  	return ret;
>  }
>  
> -static int ironlake_do_reset(struct intel_gt *gt,
> -			     intel_engine_mask_t engine_mask,
> -			     unsigned int retry)
> +static int ilk_do_reset(struct intel_gt *gt, intel_engine_mask_t engine_mask,
> +			unsigned int retry)
>  {
>  	struct intel_uncore *uncore = gt->uncore;
>  	int ret;
> @@ -597,7 +596,7 @@ static reset_func intel_get_gpu_reset(const struct intel_gt *gt)
>  	else if (INTEL_GEN(i915) >= 6)
>  		return gen6_reset_engines;
>  	else if (INTEL_GEN(i915) >= 5)
> -		return ironlake_do_reset;
> +		return ilk_do_reset;
>  	else if (IS_G4X(i915))
>  		return g4x_do_reset;
>  	else if (IS_G33(i915) || IS_PINEVIEW(i915))
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index d28468eaed57..0407229251bc 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -1001,7 +1001,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
>  	return ret;
>  }
>  
> -static int ironlake_drpc_info(struct seq_file *m)
> +static int ilk_drpc_info(struct seq_file *m)
>  {
>  	struct drm_i915_private *i915 = node_to_i915(m->private);
>  	struct intel_uncore *uncore = &i915->uncore;
> @@ -1209,7 +1209,7 @@ static int i915_drpc_info(struct seq_file *m, void *unused)
>  		else if (INTEL_GEN(dev_priv) >= 6)
>  			err = gen6_drpc_info(m);
>  		else
> -			err = ironlake_drpc_info(m);
> +			err = ilk_drpc_info(m);
>  	}
>  
>  	return err;
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 42b79f577500..2d6324d2922a 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2031,7 +2031,7 @@ static void ivb_display_irq_handler(struct drm_i915_private *dev_priv,
>   * 4 - Process the interrupt(s) that had bits set in the IIRs.
>   * 5 - Re-enable Master Interrupt Control.
>   */
> -static irqreturn_t ironlake_irq_handler(int irq, void *arg)
> +static irqreturn_t ilk_irq_handler(int irq, void *arg)
>  {
>  	struct drm_i915_private *dev_priv = arg;
>  	u32 de_iir, gt_iir, de_ier, sde_ier = 0;
> @@ -2742,7 +2742,7 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
>  
>  /* drm_dma.h hooks
>  */
> -static void ironlake_irq_reset(struct drm_i915_private *dev_priv)
> +static void ilk_irq_reset(struct drm_i915_private *dev_priv)
>  {
>  	struct intel_uncore *uncore = &dev_priv->uncore;
>  
> @@ -3225,7 +3225,7 @@ static void ibx_irq_postinstall(struct drm_i915_private *dev_priv)
>  		spt_hpd_detection_setup(dev_priv);
>  }
>  
> -static void ironlake_irq_postinstall(struct drm_i915_private *dev_priv)
> +static void ilk_irq_postinstall(struct drm_i915_private *dev_priv)
>  {
>  	struct intel_uncore *uncore = &dev_priv->uncore;
>  	u32 display_mask, extra_mask;
> @@ -3980,7 +3980,7 @@ static irq_handler_t intel_irq_handler(struct drm_i915_private *dev_priv)
>  		else if (INTEL_GEN(dev_priv) >= 8)
>  			return gen8_irq_handler;
>  		else
> -			return ironlake_irq_handler;
> +			return ilk_irq_handler;
>  	}
>  }
>  
> @@ -4003,7 +4003,7 @@ static void intel_irq_reset(struct drm_i915_private *dev_priv)
>  		else if (INTEL_GEN(dev_priv) >= 8)
>  			gen8_irq_reset(dev_priv);
>  		else
> -			ironlake_irq_reset(dev_priv);
> +			ilk_irq_reset(dev_priv);
>  	}
>  }
>  
> @@ -4026,7 +4026,7 @@ static void intel_irq_postinstall(struct drm_i915_private *dev_priv)
>  		else if (INTEL_GEN(dev_priv) >= 8)
>  			gen8_irq_postinstall(dev_priv);
>  		else
> -			ironlake_irq_postinstall(dev_priv);
> +			ilk_irq_postinstall(dev_priv);
>  	}
>  }
>  
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index eab3b029e98a..6fb6760a1559 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -178,7 +178,7 @@ static void pnv_get_mem_freq(struct drm_i915_private *dev_priv)
>  	dev_priv->is_ddr3 = (tmp & CSHRDDR3CTL_DDR3) ? 1 : 0;
>  }
>  
> -static void i915_ironlake_get_mem_freq(struct drm_i915_private *dev_priv)
> +static void ilk_get_mem_freq(struct drm_i915_private *dev_priv)
>  {
>  	u16 ddrpll, csipll;
>  
> @@ -7182,7 +7182,7 @@ void intel_init_pm(struct drm_i915_private *dev_priv)
>  	if (IS_PINEVIEW(dev_priv))
>  		pnv_get_mem_freq(dev_priv);
>  	else if (IS_GEN(dev_priv, 5))
> -		i915_ironlake_get_mem_freq(dev_priv);
> +		ilk_get_mem_freq(dev_priv);
>  
>  	if (intel_has_sagv(dev_priv))
>  		skl_setup_sagv_block_time(dev_priv);
> -- 
> 2.24.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 08/10] drm/i915: prefer 3-letter acronym for broadwell

[Matt Roper]

On Mon, Dec 23, 2019 at 09:32:42AM -0800, Lucas De Marchi wrote:
> 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>

> ---
>  drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 6 +++---
>  drivers/gpu/drm/i915/gt/intel_workarounds.c        | 2 +-
>  drivers/gpu/drm/i915/gvt/handlers.c                | 8 ++++----
>  drivers/gpu/drm/i915/i915_debugfs.c                | 6 +++---
>  drivers/gpu/drm/i915/intel_device_info.c           | 4 ++--
>  5 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> index d6e0d0be842e..1f80f275f3f2 100644
> --- 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 195ccf7db272..4e292d4bf7b9 100644
> --- 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 1043e6d564df..6d28d72e6c7e 100644
> --- a/drivers/gpu/drm/i915/gvt/handlers.c
> +++ b/drivers/gpu/drm/i915/gvt/handlers.c
> @@ -2691,7 +2691,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;
> @@ -3380,20 +3380,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 0407229251bc..cb34e8c31511 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -3815,8 +3815,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);
> @@ -3901,7 +3901,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 ca7a42e1d769..d87c31444fa8 100644
> --- 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))
> -- 
> 2.24.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 09/10] drm/i915: prefer 3-letter acronym for ivybridge

[Matt Roper]

On Mon, Dec 23, 2019 at 09:32:43AM -0800, Lucas De Marchi wrote:
> 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: 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>

> ---
>  drivers/gpu/drm/i915/display/intel_display.c       |  4 ++--
>  drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 12 ++++++------
>  drivers/gpu/drm/i915/i915_irq.c                    |  6 +++---
>  3 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 5093fd08f381..faf6d2527a50 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -5540,7 +5540,7 @@ static void cpt_set_fdi_bc_bifurcation(struct drm_i915_private *dev_priv, bool e
>  	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 drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> @@ -5613,7 +5613,7 @@ static void ilk_pch_enable(const struct intel_atomic_state *state,
>  	assert_pch_transcoder_disabled(dev_priv, pipe);
>  
>  	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
>  	 * detection works. */
> diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> index 1f80f275f3f2..6c83b350525d 100644
> --- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> +++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> @@ -139,7 +139,7 @@ static void ilk_set_fifo_underrun_reporting(struct drm_device *dev,
>  		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);
>  	enum pipe pipe = crtc->pipe;
> @@ -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));
>  }
>  
> -static void ivybridge_set_fifo_underrun_reporting(struct drm_device *dev,
> -						  enum pipe pipe,
> -						  bool enable, bool old)
> +static void ivb_set_fifo_underrun_reporting(struct drm_device *dev,
> +					    enum pipe pipe, bool enable,
> +					    bool old)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(dev);
>  	if (enable) {
> @@ -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))
>  		ilk_set_fifo_underrun_reporting(dev, pipe, enable);
>  	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)
>  		bdw_set_fifo_underrun_reporting(dev, pipe, enable);
>  
> @@ -427,7 +427,7 @@ void intel_check_cpu_fifo_underruns(struct drm_i915_private *dev_priv)
>  		if (HAS_GMCH(dev_priv))
>  			i9xx_check_fifo_underruns(crtc);
>  		else if (IS_GEN(dev_priv, 7))
> -			ivybridge_check_fifo_underruns(crtc);
> +			ivb_check_fifo_underruns(crtc);
>  	}
>  
>  	spin_unlock_irq(&dev_priv->irq_lock);
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 2d6324d2922a..afc6aad9bf8c 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -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.
>   * @work: workqueue struct
>   *
> @@ -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
>   * 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 =
>  		container_of(work, typeof(*dev_priv), l3_parity.error_work);
> @@ -3899,7 +3899,7 @@ void intel_irq_init(struct drm_i915_private *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)
>  		dev_priv->l3_parity.remap_info[i] = NULL;
>  
> -- 
> 2.24.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 10/10] drm/i915: prefer 3-letter acronym for tigerlake

[Matt Roper]

On Mon, Dec 23, 2019 at 09:32:44AM -0800, Lucas De Marchi wrote:
> 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 tigerlake to tgl 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>

> ---
>  drivers/gpu/drm/i915/gt/intel_mocs.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
> index 95f1bc45953b..eeef90b55c64 100644
> --- a/drivers/gpu/drm/i915/gt/intel_mocs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
> @@ -233,7 +233,7 @@ static const struct drm_i915_mocs_entry broxton_mocs_table[] = {
>  		   LE_3_WB | LE_TC_1_LLC | LE_LRUM(3), \
>  		   L3_1_UC)
>  
> -static const struct drm_i915_mocs_entry tigerlake_mocs_table[] = {
> +static const struct drm_i915_mocs_entry tgl_mocs_table[] = {
>  	/* Base - Error (Reserved for Non-Use) */
>  	MOCS_ENTRY(0, 0x0, 0x0),
>  	/* Base - Reserved */
> @@ -284,8 +284,8 @@ static bool get_mocs_settings(const struct drm_i915_private *i915,
>  			      struct drm_i915_mocs_table *table)
>  {
>  	if (INTEL_GEN(i915) >= 12) {
> -		table->size  = ARRAY_SIZE(tigerlake_mocs_table);
> -		table->table = tigerlake_mocs_table;
> +		table->size  = ARRAY_SIZE(tgl_mocs_table);
> +		table->table = tgl_mocs_table;
>  		table->n_entries = GEN11_NUM_MOCS_ENTRIES;
>  	} else if (IS_GEN(i915, 11)) {
>  		table->size  = ARRAY_SIZE(icl_mocs_table);
> -- 
> 2.24.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 02/10] drm/i915: prefer 3-letter acronym for pineview

[Lucas De Marchi]

On Mon, Dec 23, 2019 at 02:58:31PM -0800, Matt Roper wrote:
>On Mon, Dec 23, 2019 at 09:32:36AM -0800, Lucas De Marchi wrote:
>> 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 pineview to pnv where appropriate.
>
>Do you also want to convert watermark stuff in intel_pm.c like
>pineview_display_wm, PINEVIEW_DISPLAY_FIFO, PINEVIEW_MAX_WM, etc.?

pineview_display_wm, yes. I missed that.

I tried to avoid the constants and IS_<PLATFORM> macros as it would make
it too ugly to review. Those can be done on top.

Thanks
Lucas De Marchi

>
>
>Matt
>
>>
>> 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>
>> ---
>>  drivers/gpu/drm/i915/display/intel_display.c | 8 ++++----
>>  drivers/gpu/drm/i915/intel_pm.c              | 4 ++--
>>  2 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>> index 1860da0a493e..5d43024f35aa 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -369,7 +369,7 @@ static const struct intel_limit intel_limits_g4x_dual_channel_lvds = {
>>  	},
>>  };
>>
>> -static const struct intel_limit intel_limits_pineview_sdvo = {
>> +static const struct intel_limit pnv_limits_sdvo = {
>>  	.dot = { .min = 20000, .max = 400000},
>>  	.vco = { .min = 1700000, .max = 3500000 },
>>  	/* Pineview's Ncounter is a ring counter */
>> @@ -384,7 +384,7 @@ static const struct intel_limit intel_limits_pineview_sdvo = {
>>  		.p2_slow = 10, .p2_fast = 5 },
>>  };
>>
>> -static const struct intel_limit intel_limits_pineview_lvds = {
>> +static const struct intel_limit pnv_limits_lvds = {
>>  	.dot = { .min = 20000, .max = 400000 },
>>  	.vco = { .min = 1700000, .max = 3500000 },
>>  	.n = { .min = 3, .max = 6 },
>> @@ -8795,9 +8795,9 @@ static int pnv_crtc_compute_clock(struct intel_crtc *crtc,
>>  			DRM_DEBUG_KMS("using SSC reference clock of %d kHz\n", refclk);
>>  		}
>>
>> -		limit = &intel_limits_pineview_lvds;
>> +		limit = &pnv_limits_lvds;
>>  	} else {
>> -		limit = &intel_limits_pineview_sdvo;
>> +		limit = &pnv_limits_sdvo;
>>  	}
>>
>>  	if (!crtc_state->clock_set &&
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>> index 31ec82337e4f..eab3b029e98a 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -140,7 +140,7 @@ static void glk_init_clock_gating(struct drm_i915_private *dev_priv)
>>
>>  }
>>
>> -static void i915_pineview_get_mem_freq(struct drm_i915_private *dev_priv)
>> +static void pnv_get_mem_freq(struct drm_i915_private *dev_priv)
>>  {
>>  	u32 tmp;
>>
>> @@ -7180,7 +7180,7 @@ void intel_init_pm(struct drm_i915_private *dev_priv)
>>  {
>>  	/* For cxsr */
>>  	if (IS_PINEVIEW(dev_priv))
>> -		i915_pineview_get_mem_freq(dev_priv);
>> +		pnv_get_mem_freq(dev_priv);
>>  	else if (IS_GEN(dev_priv, 5))
>>  		i915_ironlake_get_mem_freq(dev_priv);
>>
>> --
>> 2.24.0
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>-- 
>Matt Roper
>Graphics Software Engineer
>VTT-OSGC Platform Enablement
>Intel Corporation
>(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 07/10] drm/i915: prefer 3-letter acronym for ironlake

[Lucas De Marchi]

On Mon, Dec 23, 2019 at 03:13:30PM -0800, Matt Roper wrote:
>On Mon, Dec 23, 2019 at 09:32:41AM -0800, Lucas De Marchi wrote:
>> 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.
>
>DP_SCRAMBLING_DISABLE_IRONLAKE could be shortened, but afaics it's never
>used anywhere so you might as well just remove it.
>
>It can also be removed from the gma500 driver too.  :-)

yeah... it followed on the "I'm not converting constants" case. I will
review how many constants like those we have and decide on next
iteration.

thanks
Lucas De Marchi

>
>
>Matt
>
>>
>> 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>
>> ---
>>  drivers/gpu/drm/i915/display/intel_crt.c      |   8 +-
>>  drivers/gpu/drm/i915/display/intel_ddi.c      |   2 +-
>>  drivers/gpu/drm/i915/display/intel_display.c  | 168 +++++++++---------
>>  drivers/gpu/drm/i915/display/intel_display.h  |   4 +-
>>  drivers/gpu/drm/i915/display/intel_dp.c       |  34 ++--
>>  drivers/gpu/drm/i915/display/intel_dp_mst.c   |   2 +-
>>  .../drm/i915/display/intel_fifo_underrun.c    |   6 +-
>>  drivers/gpu/drm/i915/gt/intel_reset.c         |   7 +-
>>  drivers/gpu/drm/i915/i915_debugfs.c           |   4 +-
>>  drivers/gpu/drm/i915/i915_irq.c               |  12 +-
>>  drivers/gpu/drm/i915/intel_pm.c               |   4 +-
>>  11 files changed, 125 insertions(+), 126 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
>> index b2b1336ecdb6..cbe5978e7fb5 100644
>> --- a/drivers/gpu/drm/i915/display/intel_crt.c
>> +++ b/drivers/gpu/drm/i915/display/intel_crt.c
>> @@ -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);
>>
>> @@ -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 */
>> @@ -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);
>> @@ -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);
>> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
>> index b52c31721755..62fa73815d8a 100644
>> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
>> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
>> @@ -3898,7 +3898,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:
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>> index 461691cc2f62..5093fd08f381 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -145,8 +145,8 @@ static const u64 cursor_format_modifiers[] = {
>>
>>  static void i9xx_crtc_clock_get(struct intel_crtc *crtc,
>>  				struct intel_crtc_state *pipe_config);
>> -static void ironlake_pch_clock_get(struct intel_crtc *crtc,
>> -				   struct intel_crtc_state *pipe_config);
>> +static void ilk_pch_clock_get(struct intel_crtc *crtc,
>> +			      struct intel_crtc_state *pipe_config);
>>
>>  static int intel_framebuffer_init(struct intel_framebuffer *ifb,
>>  				  struct drm_i915_gem_object *obj,
>> @@ -157,7 +157,7 @@ static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_sta
>>  					 const struct intel_link_m_n *m_n,
>>  					 const struct intel_link_m_n *m2_n2);
>>  static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state);
>> -static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state);
>> +static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state);
>>  static void hsw_set_pipeconf(const struct intel_crtc_state *crtc_state);
>>  static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state);
>>  static void vlv_prepare_pll(struct intel_crtc *crtc,
>> @@ -165,7 +165,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
>>  static void chv_prepare_pll(struct intel_crtc *crtc,
>>  			    const struct intel_crtc_state *pipe_config);
>>  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 ilk_pfit_enable(const struct intel_crtc_state *crtc_state);
>>  static void intel_modeset_setup_hw_state(struct drm_device *dev,
>>  					 struct drm_modeset_acquire_ctx *ctx);
>>  static struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc);
>> @@ -402,7 +402,7 @@ static const struct intel_limit pnv_limits_lvds = {
>>   * We calculate clock using (register_value + 2) for N/M1/M2, so here
>>   * the range value for them is (actual_value - 2).
>>   */
>> -static const struct intel_limit intel_limits_ironlake_dac = {
>> +static const struct intel_limit ilk_limits_dac = {
>>  	.dot = { .min = 25000, .max = 350000 },
>>  	.vco = { .min = 1760000, .max = 3510000 },
>>  	.n = { .min = 1, .max = 5 },
>> @@ -415,7 +415,7 @@ static const struct intel_limit intel_limits_ironlake_dac = {
>>  		.p2_slow = 10, .p2_fast = 5 },
>>  };
>>
>> -static const struct intel_limit intel_limits_ironlake_single_lvds = {
>> +static const struct intel_limit ilk_limits_single_lvds = {
>>  	.dot = { .min = 25000, .max = 350000 },
>>  	.vco = { .min = 1760000, .max = 3510000 },
>>  	.n = { .min = 1, .max = 3 },
>> @@ -428,7 +428,7 @@ static const struct intel_limit intel_limits_ironlake_single_lvds = {
>>  		.p2_slow = 14, .p2_fast = 14 },
>>  };
>>
>> -static const struct intel_limit intel_limits_ironlake_dual_lvds = {
>> +static const struct intel_limit ilk_limits_dual_lvds = {
>>  	.dot = { .min = 25000, .max = 350000 },
>>  	.vco = { .min = 1760000, .max = 3510000 },
>>  	.n = { .min = 1, .max = 3 },
>> @@ -442,7 +442,7 @@ static const struct intel_limit intel_limits_ironlake_dual_lvds = {
>>  };
>>
>>  /* LVDS 100mhz refclk limits. */
>> -static const struct intel_limit intel_limits_ironlake_single_lvds_100m = {
>> +static const struct intel_limit ilk_limits_single_lvds_100m = {
>>  	.dot = { .min = 25000, .max = 350000 },
>>  	.vco = { .min = 1760000, .max = 3510000 },
>>  	.n = { .min = 1, .max = 2 },
>> @@ -455,7 +455,7 @@ static const struct intel_limit intel_limits_ironlake_single_lvds_100m = {
>>  		.p2_slow = 14, .p2_fast = 14 },
>>  };
>>
>> -static const struct intel_limit intel_limits_ironlake_dual_lvds_100m = {
>> +static const struct intel_limit ilk_limits_dual_lvds_100m = {
>>  	.dot = { .min = 25000, .max = 350000 },
>>  	.vco = { .min = 1760000, .max = 3510000 },
>>  	.n = { .min = 1, .max = 3 },
>> @@ -1637,7 +1637,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
>>  		     I915_READ(dpll_reg) & port_mask, expected_mask);
>>  }
>>
>> -static void ironlake_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)
>> +static void ilk_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)
>>  {
>>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>> @@ -1735,8 +1735,8 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv,
>>  		DRM_ERROR("Failed to enable PCH transcoder\n");
>>  }
>>
>> -static void ironlake_disable_pch_transcoder(struct drm_i915_private *dev_priv,
>> -					    enum pipe pipe)
>> +static void ilk_disable_pch_transcoder(struct drm_i915_private *dev_priv,
>> +				       enum pipe pipe)
>>  {
>>  	i915_reg_t reg;
>>  	u32 val;
>> @@ -4869,8 +4869,8 @@ static void intel_fdi_normal_train(struct intel_crtc *crtc)
>>  }
>>
>>  /* The FDI link training functions for ILK/Ibexpeak. */
>> -static void ironlake_fdi_link_train(struct intel_crtc *crtc,
>> -				    const struct intel_crtc_state *crtc_state)
>> +static void ilk_fdi_link_train(struct intel_crtc *crtc,
>> +			       const struct intel_crtc_state *crtc_state)
>>  {
>>  	struct drm_device *dev = crtc->base.dev;
>>  	struct drm_i915_private *dev_priv = to_i915(dev);
>> @@ -5222,7 +5222,7 @@ static void ivb_manual_fdi_link_train(struct intel_crtc *crtc,
>>  	DRM_DEBUG_KMS("FDI train done.\n");
>>  }
>>
>> -static void ironlake_fdi_pll_enable(const struct intel_crtc_state *crtc_state)
>> +static void ilk_fdi_pll_enable(const struct intel_crtc_state *crtc_state)
>>  {
>>  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->uapi.crtc);
>>  	struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev);
>> @@ -5259,7 +5259,7 @@ static void ironlake_fdi_pll_enable(const struct intel_crtc_state *crtc_state)
>>  	}
>>  }
>>
>> -static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc)
>> +static void ilk_fdi_pll_disable(struct intel_crtc *intel_crtc)
>>  {
>>  	struct drm_device *dev = intel_crtc->base.dev;
>>  	struct drm_i915_private *dev_priv = to_i915(dev);
>> @@ -5289,7 +5289,7 @@ static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc)
>>  	udelay(100);
>>  }
>>
>> -static void ironlake_fdi_disable(struct intel_crtc *crtc)
>> +static void ilk_fdi_disable(struct intel_crtc *crtc)
>>  {
>>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>>  	enum pipe pipe = crtc->pipe;
>> @@ -5496,8 +5496,8 @@ int lpt_get_iclkip(struct drm_i915_private *dev_priv)
>>  				 desired_divisor << auxdiv);
>>  }
>>
>> -static void ironlake_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_state,
>> -						enum pipe pch_transcoder)
>> +static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_state,
>> +					   enum pipe pch_transcoder)
>>  {
>>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>> @@ -5601,8 +5601,8 @@ intel_get_crtc_new_encoder(const struct intel_atomic_state *state,
>>   *   - DP transcoding bits
>>   *   - transcoder
>>   */
>> -static void ironlake_pch_enable(const struct intel_atomic_state *state,
>> -				const struct intel_crtc_state *crtc_state)
>> +static void ilk_pch_enable(const struct intel_atomic_state *state,
>> +			   const struct intel_crtc_state *crtc_state)
>>  {
>>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>>  	struct drm_device *dev = crtc->base.dev;
>> @@ -5650,7 +5650,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,
>>
>>  	/* set transcoder timing, panel must allow it */
>>  	assert_panel_unlocked(dev_priv, pipe);
>> -	ironlake_pch_transcoder_set_timings(crtc_state, pipe);
>> +	ilk_pch_transcoder_set_timings(crtc_state, pipe);
>>
>>  	intel_fdi_normal_train(crtc);
>>
>> @@ -5682,7 +5682,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,
>>  		I915_WRITE(reg, temp);
>>  	}
>>
>> -	ironlake_enable_pch_transcoder(crtc_state);
>> +	ilk_enable_pch_transcoder(crtc_state);
>>  }
>>
>>  static void lpt_pch_enable(const struct intel_atomic_state *state,
>> @@ -5697,7 +5697,7 @@ static void lpt_pch_enable(const struct intel_atomic_state *state,
>>  	lpt_program_iclkip(crtc_state);
>>
>>  	/* Set transcoder timing. */
>> -	ironlake_pch_transcoder_set_timings(crtc_state, PIPE_A);
>> +	ilk_pch_transcoder_set_timings(crtc_state, PIPE_A);
>>
>>  	lpt_enable_pch_transcoder(dev_priv, cpu_transcoder);
>>  }
>> @@ -6047,7 +6047,7 @@ 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 ilk_pfit_enable(const struct intel_crtc_state *crtc_state)
>>  {
>>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>> @@ -6643,8 +6643,8 @@ static void intel_disable_primary_plane(const struct intel_crtc_state *crtc_stat
>>  	plane->disable_plane(plane, crtc_state);
>>  }
>>
>> -static void ironlake_crtc_enable(struct intel_atomic_state *state,
>> -				 struct intel_crtc *crtc)
>> +static void ilk_crtc_enable(struct intel_atomic_state *state,
>> +			    struct intel_crtc *crtc)
>>  {
>>  	const struct intel_crtc_state *new_crtc_state =
>>  		intel_atomic_get_new_crtc_state(state, crtc);
>> @@ -6680,7 +6680,7 @@ static void ironlake_crtc_enable(struct intel_atomic_state *state,
>>  		intel_cpu_transcoder_set_m_n(new_crtc_state,
>>  					     &new_crtc_state->fdi_m_n, NULL);
>>
>> -	ironlake_set_pipeconf(new_crtc_state);
>> +	ilk_set_pipeconf(new_crtc_state);
>>
>>  	crtc->active = true;
>>
>> @@ -6690,13 +6690,13 @@ static void ironlake_crtc_enable(struct intel_atomic_state *state,
>>  		/* Note: FDI PLL enabling _must_ be done before we enable the
>>  		 * cpu pipes, hence this is separate from all the other fdi/pch
>>  		 * enabling. */
>> -		ironlake_fdi_pll_enable(new_crtc_state);
>> +		ilk_fdi_pll_enable(new_crtc_state);
>>  	} else {
>>  		assert_fdi_tx_disabled(dev_priv, pipe);
>>  		assert_fdi_rx_disabled(dev_priv, pipe);
>>  	}
>>
>> -	ironlake_pfit_enable(new_crtc_state);
>> +	ilk_pfit_enable(new_crtc_state);
>>
>>  	/*
>>  	 * On ILK+ LUT must be loaded before the pipe is running but with
>> @@ -6712,7 +6712,7 @@ static void ironlake_crtc_enable(struct intel_atomic_state *state,
>>  	intel_enable_pipe(new_crtc_state);
>>
>>  	if (new_crtc_state->has_pch_encoder)
>> -		ironlake_pch_enable(state, new_crtc_state);
>> +		ilk_pch_enable(state, new_crtc_state);
>>
>>  	intel_crtc_vblank_on(new_crtc_state);
>>
>> @@ -6846,7 +6846,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
>>  	if (INTEL_GEN(dev_priv) >= 9)
>>  		skl_pfit_enable(new_crtc_state);
>>  	else
>> -		ironlake_pfit_enable(new_crtc_state);
>> +		ilk_pfit_enable(new_crtc_state);
>>
>>  	/*
>>  	 * On ILK+ LUT must be loaded before the pipe is running but with
>> @@ -6895,7 +6895,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
>>  	}
>>  }
>>
>> -void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state)
>> +void ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state)
>>  {
>>  	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
>>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>> @@ -6910,8 +6910,8 @@ void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state)
>>  	}
>>  }
>>
>> -static void ironlake_crtc_disable(struct intel_atomic_state *state,
>> -				  struct intel_crtc *crtc)
>> +static void ilk_crtc_disable(struct intel_atomic_state *state,
>> +			     struct intel_crtc *crtc)
>>  {
>>  	const struct intel_crtc_state *old_crtc_state =
>>  		intel_atomic_get_old_crtc_state(state, crtc);
>> @@ -6932,15 +6932,15 @@ static void ironlake_crtc_disable(struct intel_atomic_state *state,
>>
>>  	intel_disable_pipe(old_crtc_state);
>>
>> -	ironlake_pfit_disable(old_crtc_state);
>> +	ilk_pfit_disable(old_crtc_state);
>>
>>  	if (old_crtc_state->has_pch_encoder)
>> -		ironlake_fdi_disable(crtc);
>> +		ilk_fdi_disable(crtc);
>>
>>  	intel_encoders_post_disable(state, crtc);
>>
>>  	if (old_crtc_state->has_pch_encoder) {
>> -		ironlake_disable_pch_transcoder(dev_priv, pipe);
>> +		ilk_disable_pch_transcoder(dev_priv, pipe);
>>
>>  		if (HAS_PCH_CPT(dev_priv)) {
>>  			i915_reg_t reg;
>> @@ -6960,7 +6960,7 @@ static void ironlake_crtc_disable(struct intel_atomic_state *state,
>>  			I915_WRITE(PCH_DPLL_SEL, temp);
>>  		}
>>
>> -		ironlake_fdi_pll_disable(crtc);
>> +		ilk_fdi_pll_disable(crtc);
>>  	}
>>
>>  	intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, true);
>> @@ -7505,8 +7505,8 @@ static int pipe_required_fdi_lanes(struct intel_crtc_state *crtc_state)
>>  	return 0;
>>  }
>>
>> -static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
>> -				     struct intel_crtc_state *pipe_config)
>> +static int ilk_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
>> +			       struct intel_crtc_state *pipe_config)
>>  {
>>  	struct drm_i915_private *dev_priv = to_i915(dev);
>>  	struct drm_atomic_state *state = pipe_config->uapi.state;
>> @@ -7578,8 +7578,8 @@ static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
>>  }
>>
>>  #define RETRY 1
>> -static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc,
>> -				       struct intel_crtc_state *pipe_config)
>> +static int ilk_fdi_compute_config(struct intel_crtc *intel_crtc,
>> +				  struct intel_crtc_state *pipe_config)
>>  {
>>  	struct drm_device *dev = intel_crtc->base.dev;
>>  	const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;
>> @@ -7598,15 +7598,15 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc,
>>
>>  	fdi_dotclock = adjusted_mode->crtc_clock;
>>
>> -	lane = ironlake_get_lanes_required(fdi_dotclock, link_bw,
>> -					   pipe_config->pipe_bpp);
>> +	lane = ilk_get_lanes_required(fdi_dotclock, link_bw,
>> +				      pipe_config->pipe_bpp);
>>
>>  	pipe_config->fdi_lanes = lane;
>>
>>  	intel_link_compute_m_n(pipe_config->pipe_bpp, lane, fdi_dotclock,
>>  			       link_bw, &pipe_config->fdi_m_n, false, false);
>>
>> -	ret = ironlake_check_fdi_lanes(dev, intel_crtc->pipe, pipe_config);
>> +	ret = ilk_check_fdi_lanes(dev, intel_crtc->pipe, pipe_config);
>>  	if (ret == -EDEADLK)
>>  		return ret;
>>
>> @@ -7812,7 +7812,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
>>  	intel_crtc_compute_pixel_rate(pipe_config);
>>
>>  	if (pipe_config->has_pch_encoder)
>> -		return ironlake_fdi_compute_config(crtc, pipe_config);
>> +		return ilk_fdi_compute_config(crtc, pipe_config);
>>
>>  	return 0;
>>  }
>> @@ -9224,7 +9224,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
>>  	return ret;
>>  }
>>
>> -static void ironlake_init_pch_refclk(struct drm_i915_private *dev_priv)
>> +static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv)
>>  {
>>  	struct intel_encoder *encoder;
>>  	int i;
>> @@ -9722,12 +9722,12 @@ static void lpt_init_pch_refclk(struct drm_i915_private *dev_priv)
>>  void intel_init_pch_refclk(struct drm_i915_private *dev_priv)
>>  {
>>  	if (HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv))
>> -		ironlake_init_pch_refclk(dev_priv);
>> +		ilk_init_pch_refclk(dev_priv);
>>  	else if (HAS_PCH_LPT(dev_priv))
>>  		lpt_init_pch_refclk(dev_priv);
>>  }
>>
>> -static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state)
>> +static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state)
>>  {
>>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>> @@ -9871,7 +9871,7 @@ int bdw_get_pipemisc_bpp(struct intel_crtc *crtc)
>>  	}
>>  }
>>
>> -int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp)
>> +int ilk_get_lanes_required(int target_clock, int link_bw, int bpp)
>>  {
>>  	/*
>>  	 * Account for spread spectrum to avoid
>> @@ -9882,14 +9882,14 @@ int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp)
>>  	return DIV_ROUND_UP(bps, link_bw * 8);
>>  }
>>
>> -static bool ironlake_needs_fb_cb_tune(struct dpll *dpll, int factor)
>> +static bool ilk_needs_fb_cb_tune(struct dpll *dpll, int factor)
>>  {
>>  	return i9xx_dpll_compute_m(dpll) < factor * dpll->n;
>>  }
>>
>> -static void ironlake_compute_dpll(struct intel_crtc *crtc,
>> -				  struct intel_crtc_state *crtc_state,
>> -				  struct dpll *reduced_clock)
>> +static void ilk_compute_dpll(struct intel_crtc *crtc,
>> +			     struct intel_crtc_state *crtc_state,
>> +			     struct dpll *reduced_clock)
>>  {
>>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>>  	u32 dpll, fp, fp2;
>> @@ -9909,7 +9909,7 @@ static void ironlake_compute_dpll(struct intel_crtc *crtc,
>>
>>  	fp = i9xx_dpll_compute_fp(&crtc_state->dpll);
>>
>> -	if (ironlake_needs_fb_cb_tune(&crtc_state->dpll, factor))
>> +	if (ilk_needs_fb_cb_tune(&crtc_state->dpll, factor))
>>  		fp |= FP_CB_TUNE;
>>
>>  	if (reduced_clock) {
>> @@ -9989,8 +9989,8 @@ static void ironlake_compute_dpll(struct intel_crtc *crtc,
>>  	crtc_state->dpll_hw_state.fp1 = fp2;
>>  }
>>
>> -static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
>> -				       struct intel_crtc_state *crtc_state)
>> +static int ilk_crtc_compute_clock(struct intel_crtc *crtc,
>> +				  struct intel_crtc_state *crtc_state)
>>  {
>>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>>  	struct intel_atomic_state *state =
>> @@ -10014,17 +10014,17 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
>>
>>  		if (intel_is_dual_link_lvds(dev_priv)) {
>>  			if (refclk == 100000)
>> -				limit = &intel_limits_ironlake_dual_lvds_100m;
>> +				limit = &ilk_limits_dual_lvds_100m;
>>  			else
>> -				limit = &intel_limits_ironlake_dual_lvds;
>> +				limit = &ilk_limits_dual_lvds;
>>  		} else {
>>  			if (refclk == 100000)
>> -				limit = &intel_limits_ironlake_single_lvds_100m;
>> +				limit = &ilk_limits_single_lvds_100m;
>>  			else
>> -				limit = &intel_limits_ironlake_single_lvds;
>> +				limit = &ilk_limits_single_lvds;
>>  		}
>>  	} else {
>> -		limit = &intel_limits_ironlake_dac;
>> +		limit = &ilk_limits_dac;
>>  	}
>>
>>  	if (!crtc_state->clock_set &&
>> @@ -10034,7 +10034,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
>>  		return -EINVAL;
>>  	}
>>
>> -	ironlake_compute_dpll(crtc, crtc_state, NULL);
>> +	ilk_compute_dpll(crtc, crtc_state, NULL);
>>
>>  	if (!intel_reserve_shared_dplls(state, crtc, NULL)) {
>>  		DRM_DEBUG_KMS("failed to find PLL for pipe %c\n",
>> @@ -10109,8 +10109,8 @@ void intel_dp_get_m_n(struct intel_crtc *crtc,
>>  					     &pipe_config->dp_m2_n2);
>>  }
>>
>> -static void ironlake_get_fdi_m_n_config(struct intel_crtc *crtc,
>> -					struct intel_crtc_state *pipe_config)
>> +static void ilk_get_fdi_m_n_config(struct intel_crtc *crtc,
>> +				   struct intel_crtc_state *pipe_config)
>>  {
>>  	intel_cpu_transcoder_get_m_n(crtc, pipe_config->cpu_transcoder,
>>  				     &pipe_config->fdi_m_n, NULL);
>> @@ -10276,8 +10276,8 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
>>  	kfree(intel_fb);
>>  }
>>
>> -static void ironlake_get_pfit_config(struct intel_crtc *crtc,
>> -				     struct intel_crtc_state *pipe_config)
>> +static void ilk_get_pfit_config(struct intel_crtc *crtc,
>> +				struct intel_crtc_state *pipe_config)
>>  {
>>  	struct drm_device *dev = crtc->base.dev;
>>  	struct drm_i915_private *dev_priv = to_i915(dev);
>> @@ -10300,8 +10300,8 @@ static void ironlake_get_pfit_config(struct intel_crtc *crtc,
>>  	}
>>  }
>>
>> -static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
>> -				     struct intel_crtc_state *pipe_config)
>> +static bool ilk_get_pipe_config(struct intel_crtc *crtc,
>> +				struct intel_crtc_state *pipe_config)
>>  {
>>  	struct drm_device *dev = crtc->base.dev;
>>  	struct drm_i915_private *dev_priv = to_i915(dev);
>> @@ -10372,7 +10372,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
>>  		pipe_config->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>
>>  					  FDI_DP_PORT_WIDTH_SHIFT) + 1;
>>
>> -		ironlake_get_fdi_m_n_config(crtc, pipe_config);
>> +		ilk_get_fdi_m_n_config(crtc, pipe_config);
>>
>>  		if (HAS_PCH_IBX(dev_priv)) {
>>  			/*
>> @@ -10400,7 +10400,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
>>  			((tmp & PLL_REF_SDVO_HDMI_MULTIPLIER_MASK)
>>  			 >> PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT) + 1;
>>
>> -		ironlake_pch_clock_get(crtc, pipe_config);
>> +		ilk_pch_clock_get(crtc, pipe_config);
>>  	} else {
>>  		pipe_config->pixel_multiplier = 1;
>>  	}
>> @@ -10408,7 +10408,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
>>  	intel_get_pipe_timings(crtc, pipe_config);
>>  	intel_get_pipe_src_size(crtc, pipe_config);
>>
>> -	ironlake_get_pfit_config(crtc, pipe_config);
>> +	ilk_get_pfit_config(crtc, pipe_config);
>>
>>  	ret = true;
>>
>> @@ -10769,7 +10769,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
>>  		pipe_config->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>
>>  					  FDI_DP_PORT_WIDTH_SHIFT) + 1;
>>
>> -		ironlake_get_fdi_m_n_config(crtc, pipe_config);
>> +		ilk_get_fdi_m_n_config(crtc, pipe_config);
>>  	}
>>  }
>>
>> @@ -10921,7 +10921,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
>>  		if (INTEL_GEN(dev_priv) >= 9)
>>  			skl_get_pfit_config(crtc, pipe_config);
>>  		else
>> -			ironlake_get_pfit_config(crtc, pipe_config);
>> +			ilk_get_pfit_config(crtc, pipe_config);
>>  	}
>>
>>  	if (hsw_crtc_supports_ips(crtc)) {
>> @@ -11864,8 +11864,8 @@ int intel_dotclock_calculate(int link_freq,
>>  	return div_u64(mul_u32_u32(m_n->link_m, link_freq), m_n->link_n);
>>  }
>>
>> -static void ironlake_pch_clock_get(struct intel_crtc *crtc,
>> -				   struct intel_crtc_state *pipe_config)
>> +static void ilk_pch_clock_get(struct intel_crtc *crtc,
>> +			      struct intel_crtc_state *pipe_config)
>>  {
>>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>>
>> @@ -14472,9 +14472,9 @@ static void intel_pipe_fastset(const struct intel_crtc_state *old_crtc_state,
>>  			skl_pfit_enable(new_crtc_state);
>>  	} else if (HAS_PCH_SPLIT(dev_priv)) {
>>  		if (new_crtc_state->pch_pfit.enabled)
>> -			ironlake_pfit_enable(new_crtc_state);
>> +			ilk_pfit_enable(new_crtc_state);
>>  		else if (old_crtc_state->pch_pfit.enabled)
>> -			ironlake_pfit_disable(old_crtc_state);
>> +			ilk_pfit_disable(old_crtc_state);
>>  	}
>>
>>  	if (INTEL_GEN(dev_priv) >= 11)
>> @@ -16826,13 +16826,13 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
>>  		dev_priv->display.crtc_enable = hsw_crtc_enable;
>>  		dev_priv->display.crtc_disable = hsw_crtc_disable;
>>  	} else if (HAS_PCH_SPLIT(dev_priv)) {
>> -		dev_priv->display.get_pipe_config = ironlake_get_pipe_config;
>> +		dev_priv->display.get_pipe_config = ilk_get_pipe_config;
>>  		dev_priv->display.get_initial_plane_config =
>>  			i9xx_get_initial_plane_config;
>>  		dev_priv->display.crtc_compute_clock =
>> -			ironlake_crtc_compute_clock;
>> -		dev_priv->display.crtc_enable = ironlake_crtc_enable;
>> -		dev_priv->display.crtc_disable = ironlake_crtc_disable;
>> +			ilk_crtc_compute_clock;
>> +		dev_priv->display.crtc_enable = ilk_crtc_enable;
>> +		dev_priv->display.crtc_disable = ilk_crtc_disable;
>>  	} else if (IS_CHERRYVIEW(dev_priv)) {
>>  		dev_priv->display.get_pipe_config = i9xx_get_pipe_config;
>>  		dev_priv->display.get_initial_plane_config =
>> @@ -16878,7 +16878,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
>>  	}
>>
>>  	if (IS_GEN(dev_priv, 5)) {
>> -		dev_priv->display.fdi_link_train = ironlake_fdi_link_train;
>> +		dev_priv->display.fdi_link_train = ilk_fdi_link_train;
>>  	} else if (IS_GEN(dev_priv, 6)) {
>>  		dev_priv->display.fdi_link_train = gen6_fdi_link_train;
>>  	} else if (IS_IVYBRIDGE(dev_priv)) {
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
>> index 921a584c3284..bc2c5104f755 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display.h
>> @@ -521,7 +521,7 @@ int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data,
>>  u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc);
>>  void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state);
>>
>> -int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp);
>> +int ilk_get_lanes_required(int target_clock, int link_bw, int bpp);
>>  void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
>>  			 struct intel_digital_port *dport,
>>  			 unsigned int expected_mask);
>> @@ -579,7 +579,7 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
>>  u16 skl_scaler_calc_phase(int sub, int scale, bool chroma_center);
>>  int skl_update_scaler_crtc(struct intel_crtc_state *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 ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state);
>>  u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
>>  			const struct intel_plane_state *plane_state);
>>  u32 glk_plane_color_ctl_crtc(const struct intel_crtc_state *crtc_state);
>> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
>> index 2f31d226c6eb..991f343579ef 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
>> @@ -2509,7 +2509,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,
>>  	 *
>>  	 * CPT PCH is quite different, having many bits moved
>>  	 * to the TRANS_DP_CTL register instead. That
>> -	 * configuration happens (oddly) in ironlake_pch_enable
>> +	 * configuration happens (oddly) in ilk_pch_enable
>>  	 */
>>
>>  	/* Preserve the BIOS-computed detected bit. This is
>> @@ -2653,7 +2653,7 @@ static void edp_wait_backlight_off(struct intel_dp *intel_dp)
>>   * is locked
>>   */
>>
>> -static  u32 ironlake_get_pp_control(struct intel_dp *intel_dp)
>> +static  u32 ilk_get_pp_control(struct intel_dp *intel_dp)
>>  {
>>  	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>>  	u32 control;
>> @@ -2703,7 +2703,7 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)
>>  	if (!edp_have_panel_power(intel_dp))
>>  		wait_panel_power_cycle(intel_dp);
>>
>> -	pp = ironlake_get_pp_control(intel_dp);
>> +	pp = ilk_get_pp_control(intel_dp);
>>  	pp |= EDP_FORCE_VDD;
>>
>>  	pp_stat_reg = _pp_stat_reg(intel_dp);
>> @@ -2768,7 +2768,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)
>>  		      intel_dig_port->base.base.base.id,
>>  		      intel_dig_port->base.base.name);
>>
>> -	pp = ironlake_get_pp_control(intel_dp);
>> +	pp = ilk_get_pp_control(intel_dp);
>>  	pp &= ~EDP_FORCE_VDD;
>>
>>  	pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
>> @@ -2864,7 +2864,7 @@ static void edp_panel_on(struct intel_dp *intel_dp)
>>  	wait_panel_power_cycle(intel_dp);
>>
>>  	pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
>> -	pp = ironlake_get_pp_control(intel_dp);
>> +	pp = ilk_get_pp_control(intel_dp);
>>  	if (IS_GEN(dev_priv, 5)) {
>>  		/* ILK workaround: disable reset around power sequence */
>>  		pp &= ~PANEL_POWER_RESET;
>> @@ -2919,7 +2919,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)
>>  	WARN(!intel_dp->want_panel_vdd, "Need [ENCODER:%d:%s] VDD to turn off panel\n",
>>  	     dig_port->base.base.base.id, dig_port->base.base.name);
>>
>> -	pp = ironlake_get_pp_control(intel_dp);
>> +	pp = ilk_get_pp_control(intel_dp);
>>  	/* We need to switch off panel power _and_ force vdd, for otherwise some
>>  	 * panels get very unhappy and cease to work. */
>>  	pp &= ~(PANEL_POWER_ON | PANEL_POWER_RESET | EDP_FORCE_VDD |
>> @@ -2968,7 +2968,7 @@ static void _intel_edp_backlight_on(struct intel_dp *intel_dp)
>>  		i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
>>  		u32 pp;
>>
>> -		pp = ironlake_get_pp_control(intel_dp);
>> +		pp = ilk_get_pp_control(intel_dp);
>>  		pp |= EDP_BLC_ENABLE;
>>
>>  		I915_WRITE(pp_ctrl_reg, pp);
>> @@ -3004,7 +3004,7 @@ static void _intel_edp_backlight_off(struct intel_dp *intel_dp)
>>  		i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
>>  		u32 pp;
>>
>> -		pp = ironlake_get_pp_control(intel_dp);
>> +		pp = ilk_get_pp_control(intel_dp);
>>  		pp &= ~EDP_BLC_ENABLE;
>>
>>  		I915_WRITE(pp_ctrl_reg, pp);
>> @@ -3042,7 +3042,7 @@ static void intel_edp_backlight_power(struct intel_connector *connector,
>>
>>  	is_enabled = false;
>>  	with_pps_lock(intel_dp, wakeref)
>> -		is_enabled = ironlake_get_pp_control(intel_dp) & EDP_BLC_ENABLE;
>> +		is_enabled = ilk_get_pp_control(intel_dp) & EDP_BLC_ENABLE;
>>  	if (is_enabled == enable)
>>  		return;
>>
>> @@ -3079,8 +3079,8 @@ static void assert_edp_pll(struct drm_i915_private *dev_priv, bool state)
>>  #define assert_edp_pll_enabled(d) assert_edp_pll((d), true)
>>  #define assert_edp_pll_disabled(d) assert_edp_pll((d), false)
>>
>> -static void ironlake_edp_pll_on(struct intel_dp *intel_dp,
>> -				const struct intel_crtc_state *pipe_config)
>> +static void ilk_edp_pll_on(struct intel_dp *intel_dp,
>> +			   const struct intel_crtc_state *pipe_config)
>>  {
>>  	struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);
>>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>> @@ -3119,8 +3119,8 @@ static void ironlake_edp_pll_on(struct intel_dp *intel_dp,
>>  	udelay(200);
>>  }
>>
>> -static void ironlake_edp_pll_off(struct intel_dp *intel_dp,
>> -				 const struct intel_crtc_state *old_crtc_state)
>> +static void ilk_edp_pll_off(struct intel_dp *intel_dp,
>> +			    const struct intel_crtc_state *old_crtc_state)
>>  {
>>  	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
>>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
>> @@ -3410,7 +3410,7 @@ static void g4x_post_disable_dp(struct intel_encoder *encoder,
>>
>>  	/* Only ilk+ has port A */
>>  	if (port == PORT_A)
>> -		ironlake_edp_pll_off(intel_dp, old_crtc_state);
>> +		ilk_edp_pll_off(intel_dp, old_crtc_state);
>>  }
>>
>>  static void vlv_post_disable_dp(struct intel_encoder *encoder,
>> @@ -3615,7 +3615,7 @@ static void g4x_pre_enable_dp(struct intel_encoder *encoder,
>>
>>  	/* Only ilk+ has port A */
>>  	if (port == PORT_A)
>> -		ironlake_edp_pll_on(intel_dp, pipe_config);
>> +		ilk_edp_pll_on(intel_dp, pipe_config);
>>  }
>>
>>  static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)
>> @@ -6693,7 +6693,7 @@ intel_pps_readout_hw_state(struct intel_dp *intel_dp, struct edp_power_seq *seq)
>>
>>  	intel_pps_get_registers(intel_dp, &regs);
>>
>> -	pp_ctl = ironlake_get_pp_control(intel_dp);
>> +	pp_ctl = ilk_get_pp_control(intel_dp);
>>
>>  	/* Ensure PPS is unlocked */
>>  	if (!HAS_DDI(dev_priv))
>> @@ -6863,7 +6863,7 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp,
>>  	 * soon as the new power sequencer gets initialized.
>>  	 */
>>  	if (force_disable_vdd) {
>> -		u32 pp = ironlake_get_pp_control(intel_dp);
>> +		u32 pp = ilk_get_pp_control(intel_dp);
>>
>>  		WARN(pp & PANEL_POWER_ON, "Panel power already on\n");
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
>> index 01b4608ab56c..cbf623154af1 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
>> @@ -250,7 +250,7 @@ static void intel_mst_post_disable_dp(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);
>>
>>  	/*
>>  	 * From TGL spec: "If multi-stream slave transcoder: Configure
>> diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
>> index ab61f88d1d33..d6e0d0be842e 100644
>> --- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
>> +++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
>> @@ -126,8 +126,8 @@ static void i9xx_set_fifo_underrun_reporting(struct drm_device *dev,
>>  	}
>>  }
>>
>> -static void ironlake_set_fifo_underrun_reporting(struct drm_device *dev,
>> -						 enum pipe pipe, bool enable)
>> +static void ilk_set_fifo_underrun_reporting(struct drm_device *dev,
>> +					    enum pipe pipe, bool enable)
>>  {
>>  	struct drm_i915_private *dev_priv = to_i915(dev);
>>  	u32 bit = (pipe == PIPE_A) ?
>> @@ -264,7 +264,7 @@ static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev,
>>  	if (HAS_GMCH(dev_priv))
>>  		i9xx_set_fifo_underrun_reporting(dev, pipe, enable, old);
>>  	else if (IS_GEN_RANGE(dev_priv, 5, 6))
>> -		ironlake_set_fifo_underrun_reporting(dev, pipe, enable);
>> +		ilk_set_fifo_underrun_reporting(dev, pipe, enable);
>>  	else if (IS_GEN(dev_priv, 7))
>>  		ivybridge_set_fifo_underrun_reporting(dev, pipe, enable, old);
>>  	else if (INTEL_GEN(dev_priv) >= 8)
>> diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
>> index 1c51296646e0..ea7069e238d0 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_reset.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_reset.c
>> @@ -251,9 +251,8 @@ static int g4x_do_reset(struct intel_gt *gt,
>>  	return ret;
>>  }
>>
>> -static int ironlake_do_reset(struct intel_gt *gt,
>> -			     intel_engine_mask_t engine_mask,
>> -			     unsigned int retry)
>> +static int ilk_do_reset(struct intel_gt *gt, intel_engine_mask_t engine_mask,
>> +			unsigned int retry)
>>  {
>>  	struct intel_uncore *uncore = gt->uncore;
>>  	int ret;
>> @@ -597,7 +596,7 @@ static reset_func intel_get_gpu_reset(const struct intel_gt *gt)
>>  	else if (INTEL_GEN(i915) >= 6)
>>  		return gen6_reset_engines;
>>  	else if (INTEL_GEN(i915) >= 5)
>> -		return ironlake_do_reset;
>> +		return ilk_do_reset;
>>  	else if (IS_G4X(i915))
>>  		return g4x_do_reset;
>>  	else if (IS_G33(i915) || IS_PINEVIEW(i915))
>> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>> index d28468eaed57..0407229251bc 100644
>> --- a/drivers/gpu/drm/i915/i915_debugfs.c
>> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
>> @@ -1001,7 +1001,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
>>  	return ret;
>>  }
>>
>> -static int ironlake_drpc_info(struct seq_file *m)
>> +static int ilk_drpc_info(struct seq_file *m)
>>  {
>>  	struct drm_i915_private *i915 = node_to_i915(m->private);
>>  	struct intel_uncore *uncore = &i915->uncore;
>> @@ -1209,7 +1209,7 @@ static int i915_drpc_info(struct seq_file *m, void *unused)
>>  		else if (INTEL_GEN(dev_priv) >= 6)
>>  			err = gen6_drpc_info(m);
>>  		else
>> -			err = ironlake_drpc_info(m);
>> +			err = ilk_drpc_info(m);
>>  	}
>>
>>  	return err;
>> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>> index 42b79f577500..2d6324d2922a 100644
>> --- a/drivers/gpu/drm/i915/i915_irq.c
>> +++ b/drivers/gpu/drm/i915/i915_irq.c
>> @@ -2031,7 +2031,7 @@ static void ivb_display_irq_handler(struct drm_i915_private *dev_priv,
>>   * 4 - Process the interrupt(s) that had bits set in the IIRs.
>>   * 5 - Re-enable Master Interrupt Control.
>>   */
>> -static irqreturn_t ironlake_irq_handler(int irq, void *arg)
>> +static irqreturn_t ilk_irq_handler(int irq, void *arg)
>>  {
>>  	struct drm_i915_private *dev_priv = arg;
>>  	u32 de_iir, gt_iir, de_ier, sde_ier = 0;
>> @@ -2742,7 +2742,7 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
>>
>>  /* drm_dma.h hooks
>>  */
>> -static void ironlake_irq_reset(struct drm_i915_private *dev_priv)
>> +static void ilk_irq_reset(struct drm_i915_private *dev_priv)
>>  {
>>  	struct intel_uncore *uncore = &dev_priv->uncore;
>>
>> @@ -3225,7 +3225,7 @@ static void ibx_irq_postinstall(struct drm_i915_private *dev_priv)
>>  		spt_hpd_detection_setup(dev_priv);
>>  }
>>
>> -static void ironlake_irq_postinstall(struct drm_i915_private *dev_priv)
>> +static void ilk_irq_postinstall(struct drm_i915_private *dev_priv)
>>  {
>>  	struct intel_uncore *uncore = &dev_priv->uncore;
>>  	u32 display_mask, extra_mask;
>> @@ -3980,7 +3980,7 @@ static irq_handler_t intel_irq_handler(struct drm_i915_private *dev_priv)
>>  		else if (INTEL_GEN(dev_priv) >= 8)
>>  			return gen8_irq_handler;
>>  		else
>> -			return ironlake_irq_handler;
>> +			return ilk_irq_handler;
>>  	}
>>  }
>>
>> @@ -4003,7 +4003,7 @@ static void intel_irq_reset(struct drm_i915_private *dev_priv)
>>  		else if (INTEL_GEN(dev_priv) >= 8)
>>  			gen8_irq_reset(dev_priv);
>>  		else
>> -			ironlake_irq_reset(dev_priv);
>> +			ilk_irq_reset(dev_priv);
>>  	}
>>  }
>>
>> @@ -4026,7 +4026,7 @@ static void intel_irq_postinstall(struct drm_i915_private *dev_priv)
>>  		else if (INTEL_GEN(dev_priv) >= 8)
>>  			gen8_irq_postinstall(dev_priv);
>>  		else
>> -			ironlake_irq_postinstall(dev_priv);
>> +			ilk_irq_postinstall(dev_priv);
>>  	}
>>  }
>>
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>> index eab3b029e98a..6fb6760a1559 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -178,7 +178,7 @@ static void pnv_get_mem_freq(struct drm_i915_private *dev_priv)
>>  	dev_priv->is_ddr3 = (tmp & CSHRDDR3CTL_DDR3) ? 1 : 0;
>>  }
>>
>> -static void i915_ironlake_get_mem_freq(struct drm_i915_private *dev_priv)
>> +static void ilk_get_mem_freq(struct drm_i915_private *dev_priv)
>>  {
>>  	u16 ddrpll, csipll;
>>
>> @@ -7182,7 +7182,7 @@ void intel_init_pm(struct drm_i915_private *dev_priv)
>>  	if (IS_PINEVIEW(dev_priv))
>>  		pnv_get_mem_freq(dev_priv);
>>  	else if (IS_GEN(dev_priv, 5))
>> -		i915_ironlake_get_mem_freq(dev_priv);
>> +		ilk_get_mem_freq(dev_priv);
>>
>>  	if (intel_has_sagv(dev_priv))
>>  		skl_setup_sagv_block_time(dev_priv);
>> --
>> 2.24.0
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>-- 
>Matt Roper
>Graphics Software Engineer
>VTT-OSGC Platform Enablement
>Intel Corporation
>(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 02/10] drm/i915: prefer 3-letter acronym for pineview

[Matt Roper]

On Mon, Dec 23, 2019 at 03:20:57PM -0800, Lucas De Marchi wrote:
> On Mon, Dec 23, 2019 at 02:58:31PM -0800, Matt Roper wrote:
> > On Mon, Dec 23, 2019 at 09:32:36AM -0800, Lucas De Marchi wrote:
> > > 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 pineview to pnv where appropriate.
> > 
> > Do you also want to convert watermark stuff in intel_pm.c like
> > pineview_display_wm, PINEVIEW_DISPLAY_FIFO, PINEVIEW_MAX_WM, etc.?
> 
> pineview_display_wm, yes. I missed that.
> 
> I tried to avoid the constants and IS_<PLATFORM> macros as it would make
> it too ugly to review. Those can be done on top.

Okay.  There's also:

pineview_display_hplloff_wm
pineview_cursor_wm
pineview_cursor_hplloff_wm
pineview_update_wm

too.


Matt


> 
> Thanks
> Lucas De Marchi
> 
> > 
> > 
> > Matt
> > 
> > > 
> > > 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>
> > > ---
> > >  drivers/gpu/drm/i915/display/intel_display.c | 8 ++++----
> > >  drivers/gpu/drm/i915/intel_pm.c              | 4 ++--
> > >  2 files changed, 6 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> > > index 1860da0a493e..5d43024f35aa 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > > @@ -369,7 +369,7 @@ static const struct intel_limit intel_limits_g4x_dual_channel_lvds = {
> > >  	},
> > >  };
> > > 
> > > -static const struct intel_limit intel_limits_pineview_sdvo = {
> > > +static const struct intel_limit pnv_limits_sdvo = {
> > >  	.dot = { .min = 20000, .max = 400000},
> > >  	.vco = { .min = 1700000, .max = 3500000 },
> > >  	/* Pineview's Ncounter is a ring counter */
> > > @@ -384,7 +384,7 @@ static const struct intel_limit intel_limits_pineview_sdvo = {
> > >  		.p2_slow = 10, .p2_fast = 5 },
> > >  };
> > > 
> > > -static const struct intel_limit intel_limits_pineview_lvds = {
> > > +static const struct intel_limit pnv_limits_lvds = {
> > >  	.dot = { .min = 20000, .max = 400000 },
> > >  	.vco = { .min = 1700000, .max = 3500000 },
> > >  	.n = { .min = 3, .max = 6 },
> > > @@ -8795,9 +8795,9 @@ static int pnv_crtc_compute_clock(struct intel_crtc *crtc,
> > >  			DRM_DEBUG_KMS("using SSC reference clock of %d kHz\n", refclk);
> > >  		}
> > > 
> > > -		limit = &intel_limits_pineview_lvds;
> > > +		limit = &pnv_limits_lvds;
> > >  	} else {
> > > -		limit = &intel_limits_pineview_sdvo;
> > > +		limit = &pnv_limits_sdvo;
> > >  	}
> > > 
> > >  	if (!crtc_state->clock_set &&
> > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > > index 31ec82337e4f..eab3b029e98a 100644
> > > --- a/drivers/gpu/drm/i915/intel_pm.c
> > > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > > @@ -140,7 +140,7 @@ static void glk_init_clock_gating(struct drm_i915_private *dev_priv)
> > > 
> > >  }
> > > 
> > > -static void i915_pineview_get_mem_freq(struct drm_i915_private *dev_priv)
> > > +static void pnv_get_mem_freq(struct drm_i915_private *dev_priv)
> > >  {
> > >  	u32 tmp;
> > > 
> > > @@ -7180,7 +7180,7 @@ void intel_init_pm(struct drm_i915_private *dev_priv)
> > >  {
> > >  	/* For cxsr */
> > >  	if (IS_PINEVIEW(dev_priv))
> > > -		i915_pineview_get_mem_freq(dev_priv);
> > > +		pnv_get_mem_freq(dev_priv);
> > >  	else if (IS_GEN(dev_priv, 5))
> > >  		i915_ironlake_get_mem_freq(dev_priv);
> > > 
> > > --
> > > 2.24.0
> > > 
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> > 
> > -- 
> > Matt Roper
> > Graphics Software Engineer
> > VTT-OSGC Platform Enablement
> > Intel Corporation
> > (916) 356-2795

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v3 07/10] drm/i915: prefer 3-letter acronym for ironlake

[Matt Roper]

On Mon, Dec 23, 2019 at 03:22:55PM -0800, Lucas De Marchi wrote:
> On Mon, Dec 23, 2019 at 03:13:30PM -0800, Matt Roper wrote:
> > On Mon, Dec 23, 2019 at 09:32:41AM -0800, Lucas De Marchi wrote:
> > > 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.
> > 
> > DP_SCRAMBLING_DISABLE_IRONLAKE could be shortened, but afaics it's never
> > used anywhere so you might as well just remove it.
> > 
> > It can also be removed from the gma500 driver too.  :-)
> 
> yeah... it followed on the "I'm not converting constants" case. I will
> review how many constants like those we have and decide on next
> iteration.
> 
> thanks
> Lucas De Marchi
> 

Okay, you can consider this patch

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>

too.


> > 
> > 
> > Matt
> > 
> > > 
> > > 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>
> > > ---
> > >  drivers/gpu/drm/i915/display/intel_crt.c      |   8 +-
> > >  drivers/gpu/drm/i915/display/intel_ddi.c      |   2 +-
> > >  drivers/gpu/drm/i915/display/intel_display.c  | 168 +++++++++---------
> > >  drivers/gpu/drm/i915/display/intel_display.h  |   4 +-
> > >  drivers/gpu/drm/i915/display/intel_dp.c       |  34 ++--
> > >  drivers/gpu/drm/i915/display/intel_dp_mst.c   |   2 +-
> > >  .../drm/i915/display/intel_fifo_underrun.c    |   6 +-
> > >  drivers/gpu/drm/i915/gt/intel_reset.c         |   7 +-
> > >  drivers/gpu/drm/i915/i915_debugfs.c           |   4 +-
> > >  drivers/gpu/drm/i915/i915_irq.c               |  12 +-
> > >  drivers/gpu/drm/i915/intel_pm.c               |   4 +-
> > >  11 files changed, 125 insertions(+), 126 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
> > > index b2b1336ecdb6..cbe5978e7fb5 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_crt.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_crt.c
> > > @@ -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);
> > > 
> > > @@ -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 */
> > > @@ -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);
> > > @@ -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);
> > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> > > index b52c31721755..62fa73815d8a 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> > > @@ -3898,7 +3898,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:
> > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> > > index 461691cc2f62..5093fd08f381 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > > @@ -145,8 +145,8 @@ static const u64 cursor_format_modifiers[] = {
> > > 
> > >  static void i9xx_crtc_clock_get(struct intel_crtc *crtc,
> > >  				struct intel_crtc_state *pipe_config);
> > > -static void ironlake_pch_clock_get(struct intel_crtc *crtc,
> > > -				   struct intel_crtc_state *pipe_config);
> > > +static void ilk_pch_clock_get(struct intel_crtc *crtc,
> > > +			      struct intel_crtc_state *pipe_config);
> > > 
> > >  static int intel_framebuffer_init(struct intel_framebuffer *ifb,
> > >  				  struct drm_i915_gem_object *obj,
> > > @@ -157,7 +157,7 @@ static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_sta
> > >  					 const struct intel_link_m_n *m_n,
> > >  					 const struct intel_link_m_n *m2_n2);
> > >  static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state);
> > > -static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state);
> > > +static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state);
> > >  static void hsw_set_pipeconf(const struct intel_crtc_state *crtc_state);
> > >  static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state);
> > >  static void vlv_prepare_pll(struct intel_crtc *crtc,
> > > @@ -165,7 +165,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
> > >  static void chv_prepare_pll(struct intel_crtc *crtc,
> > >  			    const struct intel_crtc_state *pipe_config);
> > >  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 ilk_pfit_enable(const struct intel_crtc_state *crtc_state);
> > >  static void intel_modeset_setup_hw_state(struct drm_device *dev,
> > >  					 struct drm_modeset_acquire_ctx *ctx);
> > >  static struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc);
> > > @@ -402,7 +402,7 @@ static const struct intel_limit pnv_limits_lvds = {
> > >   * We calculate clock using (register_value + 2) for N/M1/M2, so here
> > >   * the range value for them is (actual_value - 2).
> > >   */
> > > -static const struct intel_limit intel_limits_ironlake_dac = {
> > > +static const struct intel_limit ilk_limits_dac = {
> > >  	.dot = { .min = 25000, .max = 350000 },
> > >  	.vco = { .min = 1760000, .max = 3510000 },
> > >  	.n = { .min = 1, .max = 5 },
> > > @@ -415,7 +415,7 @@ static const struct intel_limit intel_limits_ironlake_dac = {
> > >  		.p2_slow = 10, .p2_fast = 5 },
> > >  };
> > > 
> > > -static const struct intel_limit intel_limits_ironlake_single_lvds = {
> > > +static const struct intel_limit ilk_limits_single_lvds = {
> > >  	.dot = { .min = 25000, .max = 350000 },
> > >  	.vco = { .min = 1760000, .max = 3510000 },
> > >  	.n = { .min = 1, .max = 3 },
> > > @@ -428,7 +428,7 @@ static const struct intel_limit intel_limits_ironlake_single_lvds = {
> > >  		.p2_slow = 14, .p2_fast = 14 },
> > >  };
> > > 
> > > -static const struct intel_limit intel_limits_ironlake_dual_lvds = {
> > > +static const struct intel_limit ilk_limits_dual_lvds = {
> > >  	.dot = { .min = 25000, .max = 350000 },
> > >  	.vco = { .min = 1760000, .max = 3510000 },
> > >  	.n = { .min = 1, .max = 3 },
> > > @@ -442,7 +442,7 @@ static const struct intel_limit intel_limits_ironlake_dual_lvds = {
> > >  };
> > > 
> > >  /* LVDS 100mhz refclk limits. */
> > > -static const struct intel_limit intel_limits_ironlake_single_lvds_100m = {
> > > +static const struct intel_limit ilk_limits_single_lvds_100m = {
> > >  	.dot = { .min = 25000, .max = 350000 },
> > >  	.vco = { .min = 1760000, .max = 3510000 },
> > >  	.n = { .min = 1, .max = 2 },
> > > @@ -455,7 +455,7 @@ static const struct intel_limit intel_limits_ironlake_single_lvds_100m = {
> > >  		.p2_slow = 14, .p2_fast = 14 },
> > >  };
> > > 
> > > -static const struct intel_limit intel_limits_ironlake_dual_lvds_100m = {
> > > +static const struct intel_limit ilk_limits_dual_lvds_100m = {
> > >  	.dot = { .min = 25000, .max = 350000 },
> > >  	.vco = { .min = 1760000, .max = 3510000 },
> > >  	.n = { .min = 1, .max = 3 },
> > > @@ -1637,7 +1637,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
> > >  		     I915_READ(dpll_reg) & port_mask, expected_mask);
> > >  }
> > > 
> > > -static void ironlake_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)
> > > +static void ilk_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)
> > >  {
> > >  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> > >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > > @@ -1735,8 +1735,8 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv,
> > >  		DRM_ERROR("Failed to enable PCH transcoder\n");
> > >  }
> > > 
> > > -static void ironlake_disable_pch_transcoder(struct drm_i915_private *dev_priv,
> > > -					    enum pipe pipe)
> > > +static void ilk_disable_pch_transcoder(struct drm_i915_private *dev_priv,
> > > +				       enum pipe pipe)
> > >  {
> > >  	i915_reg_t reg;
> > >  	u32 val;
> > > @@ -4869,8 +4869,8 @@ static void intel_fdi_normal_train(struct intel_crtc *crtc)
> > >  }
> > > 
> > >  /* The FDI link training functions for ILK/Ibexpeak. */
> > > -static void ironlake_fdi_link_train(struct intel_crtc *crtc,
> > > -				    const struct intel_crtc_state *crtc_state)
> > > +static void ilk_fdi_link_train(struct intel_crtc *crtc,
> > > +			       const struct intel_crtc_state *crtc_state)
> > >  {
> > >  	struct drm_device *dev = crtc->base.dev;
> > >  	struct drm_i915_private *dev_priv = to_i915(dev);
> > > @@ -5222,7 +5222,7 @@ static void ivb_manual_fdi_link_train(struct intel_crtc *crtc,
> > >  	DRM_DEBUG_KMS("FDI train done.\n");
> > >  }
> > > 
> > > -static void ironlake_fdi_pll_enable(const struct intel_crtc_state *crtc_state)
> > > +static void ilk_fdi_pll_enable(const struct intel_crtc_state *crtc_state)
> > >  {
> > >  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->uapi.crtc);
> > >  	struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev);
> > > @@ -5259,7 +5259,7 @@ static void ironlake_fdi_pll_enable(const struct intel_crtc_state *crtc_state)
> > >  	}
> > >  }
> > > 
> > > -static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc)
> > > +static void ilk_fdi_pll_disable(struct intel_crtc *intel_crtc)
> > >  {
> > >  	struct drm_device *dev = intel_crtc->base.dev;
> > >  	struct drm_i915_private *dev_priv = to_i915(dev);
> > > @@ -5289,7 +5289,7 @@ static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc)
> > >  	udelay(100);
> > >  }
> > > 
> > > -static void ironlake_fdi_disable(struct intel_crtc *crtc)
> > > +static void ilk_fdi_disable(struct intel_crtc *crtc)
> > >  {
> > >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > >  	enum pipe pipe = crtc->pipe;
> > > @@ -5496,8 +5496,8 @@ int lpt_get_iclkip(struct drm_i915_private *dev_priv)
> > >  				 desired_divisor << auxdiv);
> > >  }
> > > 
> > > -static void ironlake_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_state,
> > > -						enum pipe pch_transcoder)
> > > +static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_state,
> > > +					   enum pipe pch_transcoder)
> > >  {
> > >  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> > >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > > @@ -5601,8 +5601,8 @@ intel_get_crtc_new_encoder(const struct intel_atomic_state *state,
> > >   *   - DP transcoding bits
> > >   *   - transcoder
> > >   */
> > > -static void ironlake_pch_enable(const struct intel_atomic_state *state,
> > > -				const struct intel_crtc_state *crtc_state)
> > > +static void ilk_pch_enable(const struct intel_atomic_state *state,
> > > +			   const struct intel_crtc_state *crtc_state)
> > >  {
> > >  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> > >  	struct drm_device *dev = crtc->base.dev;
> > > @@ -5650,7 +5650,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,
> > > 
> > >  	/* set transcoder timing, panel must allow it */
> > >  	assert_panel_unlocked(dev_priv, pipe);
> > > -	ironlake_pch_transcoder_set_timings(crtc_state, pipe);
> > > +	ilk_pch_transcoder_set_timings(crtc_state, pipe);
> > > 
> > >  	intel_fdi_normal_train(crtc);
> > > 
> > > @@ -5682,7 +5682,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,
> > >  		I915_WRITE(reg, temp);
> > >  	}
> > > 
> > > -	ironlake_enable_pch_transcoder(crtc_state);
> > > +	ilk_enable_pch_transcoder(crtc_state);
> > >  }
> > > 
> > >  static void lpt_pch_enable(const struct intel_atomic_state *state,
> > > @@ -5697,7 +5697,7 @@ static void lpt_pch_enable(const struct intel_atomic_state *state,
> > >  	lpt_program_iclkip(crtc_state);
> > > 
> > >  	/* Set transcoder timing. */
> > > -	ironlake_pch_transcoder_set_timings(crtc_state, PIPE_A);
> > > +	ilk_pch_transcoder_set_timings(crtc_state, PIPE_A);
> > > 
> > >  	lpt_enable_pch_transcoder(dev_priv, cpu_transcoder);
> > >  }
> > > @@ -6047,7 +6047,7 @@ 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 ilk_pfit_enable(const struct intel_crtc_state *crtc_state)
> > >  {
> > >  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> > >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > > @@ -6643,8 +6643,8 @@ static void intel_disable_primary_plane(const struct intel_crtc_state *crtc_stat
> > >  	plane->disable_plane(plane, crtc_state);
> > >  }
> > > 
> > > -static void ironlake_crtc_enable(struct intel_atomic_state *state,
> > > -				 struct intel_crtc *crtc)
> > > +static void ilk_crtc_enable(struct intel_atomic_state *state,
> > > +			    struct intel_crtc *crtc)
> > >  {
> > >  	const struct intel_crtc_state *new_crtc_state =
> > >  		intel_atomic_get_new_crtc_state(state, crtc);
> > > @@ -6680,7 +6680,7 @@ static void ironlake_crtc_enable(struct intel_atomic_state *state,
> > >  		intel_cpu_transcoder_set_m_n(new_crtc_state,
> > >  					     &new_crtc_state->fdi_m_n, NULL);
> > > 
> > > -	ironlake_set_pipeconf(new_crtc_state);
> > > +	ilk_set_pipeconf(new_crtc_state);
> > > 
> > >  	crtc->active = true;
> > > 
> > > @@ -6690,13 +6690,13 @@ static void ironlake_crtc_enable(struct intel_atomic_state *state,
> > >  		/* Note: FDI PLL enabling _must_ be done before we enable the
> > >  		 * cpu pipes, hence this is separate from all the other fdi/pch
> > >  		 * enabling. */
> > > -		ironlake_fdi_pll_enable(new_crtc_state);
> > > +		ilk_fdi_pll_enable(new_crtc_state);
> > >  	} else {
> > >  		assert_fdi_tx_disabled(dev_priv, pipe);
> > >  		assert_fdi_rx_disabled(dev_priv, pipe);
> > >  	}
> > > 
> > > -	ironlake_pfit_enable(new_crtc_state);
> > > +	ilk_pfit_enable(new_crtc_state);
> > > 
> > >  	/*
> > >  	 * On ILK+ LUT must be loaded before the pipe is running but with
> > > @@ -6712,7 +6712,7 @@ static void ironlake_crtc_enable(struct intel_atomic_state *state,
> > >  	intel_enable_pipe(new_crtc_state);
> > > 
> > >  	if (new_crtc_state->has_pch_encoder)
> > > -		ironlake_pch_enable(state, new_crtc_state);
> > > +		ilk_pch_enable(state, new_crtc_state);
> > > 
> > >  	intel_crtc_vblank_on(new_crtc_state);
> > > 
> > > @@ -6846,7 +6846,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
> > >  	if (INTEL_GEN(dev_priv) >= 9)
> > >  		skl_pfit_enable(new_crtc_state);
> > >  	else
> > > -		ironlake_pfit_enable(new_crtc_state);
> > > +		ilk_pfit_enable(new_crtc_state);
> > > 
> > >  	/*
> > >  	 * On ILK+ LUT must be loaded before the pipe is running but with
> > > @@ -6895,7 +6895,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
> > >  	}
> > >  }
> > > 
> > > -void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state)
> > > +void ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state)
> > >  {
> > >  	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
> > >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > > @@ -6910,8 +6910,8 @@ void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state)
> > >  	}
> > >  }
> > > 
> > > -static void ironlake_crtc_disable(struct intel_atomic_state *state,
> > > -				  struct intel_crtc *crtc)
> > > +static void ilk_crtc_disable(struct intel_atomic_state *state,
> > > +			     struct intel_crtc *crtc)
> > >  {
> > >  	const struct intel_crtc_state *old_crtc_state =
> > >  		intel_atomic_get_old_crtc_state(state, crtc);
> > > @@ -6932,15 +6932,15 @@ static void ironlake_crtc_disable(struct intel_atomic_state *state,
> > > 
> > >  	intel_disable_pipe(old_crtc_state);
> > > 
> > > -	ironlake_pfit_disable(old_crtc_state);
> > > +	ilk_pfit_disable(old_crtc_state);
> > > 
> > >  	if (old_crtc_state->has_pch_encoder)
> > > -		ironlake_fdi_disable(crtc);
> > > +		ilk_fdi_disable(crtc);
> > > 
> > >  	intel_encoders_post_disable(state, crtc);
> > > 
> > >  	if (old_crtc_state->has_pch_encoder) {
> > > -		ironlake_disable_pch_transcoder(dev_priv, pipe);
> > > +		ilk_disable_pch_transcoder(dev_priv, pipe);
> > > 
> > >  		if (HAS_PCH_CPT(dev_priv)) {
> > >  			i915_reg_t reg;
> > > @@ -6960,7 +6960,7 @@ static void ironlake_crtc_disable(struct intel_atomic_state *state,
> > >  			I915_WRITE(PCH_DPLL_SEL, temp);
> > >  		}
> > > 
> > > -		ironlake_fdi_pll_disable(crtc);
> > > +		ilk_fdi_pll_disable(crtc);
> > >  	}
> > > 
> > >  	intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, true);
> > > @@ -7505,8 +7505,8 @@ static int pipe_required_fdi_lanes(struct intel_crtc_state *crtc_state)
> > >  	return 0;
> > >  }
> > > 
> > > -static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
> > > -				     struct intel_crtc_state *pipe_config)
> > > +static int ilk_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
> > > +			       struct intel_crtc_state *pipe_config)
> > >  {
> > >  	struct drm_i915_private *dev_priv = to_i915(dev);
> > >  	struct drm_atomic_state *state = pipe_config->uapi.state;
> > > @@ -7578,8 +7578,8 @@ static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe,
> > >  }
> > > 
> > >  #define RETRY 1
> > > -static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc,
> > > -				       struct intel_crtc_state *pipe_config)
> > > +static int ilk_fdi_compute_config(struct intel_crtc *intel_crtc,
> > > +				  struct intel_crtc_state *pipe_config)
> > >  {
> > >  	struct drm_device *dev = intel_crtc->base.dev;
> > >  	const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;
> > > @@ -7598,15 +7598,15 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc,
> > > 
> > >  	fdi_dotclock = adjusted_mode->crtc_clock;
> > > 
> > > -	lane = ironlake_get_lanes_required(fdi_dotclock, link_bw,
> > > -					   pipe_config->pipe_bpp);
> > > +	lane = ilk_get_lanes_required(fdi_dotclock, link_bw,
> > > +				      pipe_config->pipe_bpp);
> > > 
> > >  	pipe_config->fdi_lanes = lane;
> > > 
> > >  	intel_link_compute_m_n(pipe_config->pipe_bpp, lane, fdi_dotclock,
> > >  			       link_bw, &pipe_config->fdi_m_n, false, false);
> > > 
> > > -	ret = ironlake_check_fdi_lanes(dev, intel_crtc->pipe, pipe_config);
> > > +	ret = ilk_check_fdi_lanes(dev, intel_crtc->pipe, pipe_config);
> > >  	if (ret == -EDEADLK)
> > >  		return ret;
> > > 
> > > @@ -7812,7 +7812,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
> > >  	intel_crtc_compute_pixel_rate(pipe_config);
> > > 
> > >  	if (pipe_config->has_pch_encoder)
> > > -		return ironlake_fdi_compute_config(crtc, pipe_config);
> > > +		return ilk_fdi_compute_config(crtc, pipe_config);
> > > 
> > >  	return 0;
> > >  }
> > > @@ -9224,7 +9224,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
> > >  	return ret;
> > >  }
> > > 
> > > -static void ironlake_init_pch_refclk(struct drm_i915_private *dev_priv)
> > > +static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv)
> > >  {
> > >  	struct intel_encoder *encoder;
> > >  	int i;
> > > @@ -9722,12 +9722,12 @@ static void lpt_init_pch_refclk(struct drm_i915_private *dev_priv)
> > >  void intel_init_pch_refclk(struct drm_i915_private *dev_priv)
> > >  {
> > >  	if (HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv))
> > > -		ironlake_init_pch_refclk(dev_priv);
> > > +		ilk_init_pch_refclk(dev_priv);
> > >  	else if (HAS_PCH_LPT(dev_priv))
> > >  		lpt_init_pch_refclk(dev_priv);
> > >  }
> > > 
> > > -static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state)
> > > +static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state)
> > >  {
> > >  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> > >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > > @@ -9871,7 +9871,7 @@ int bdw_get_pipemisc_bpp(struct intel_crtc *crtc)
> > >  	}
> > >  }
> > > 
> > > -int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp)
> > > +int ilk_get_lanes_required(int target_clock, int link_bw, int bpp)
> > >  {
> > >  	/*
> > >  	 * Account for spread spectrum to avoid
> > > @@ -9882,14 +9882,14 @@ int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp)
> > >  	return DIV_ROUND_UP(bps, link_bw * 8);
> > >  }
> > > 
> > > -static bool ironlake_needs_fb_cb_tune(struct dpll *dpll, int factor)
> > > +static bool ilk_needs_fb_cb_tune(struct dpll *dpll, int factor)
> > >  {
> > >  	return i9xx_dpll_compute_m(dpll) < factor * dpll->n;
> > >  }
> > > 
> > > -static void ironlake_compute_dpll(struct intel_crtc *crtc,
> > > -				  struct intel_crtc_state *crtc_state,
> > > -				  struct dpll *reduced_clock)
> > > +static void ilk_compute_dpll(struct intel_crtc *crtc,
> > > +			     struct intel_crtc_state *crtc_state,
> > > +			     struct dpll *reduced_clock)
> > >  {
> > >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > >  	u32 dpll, fp, fp2;
> > > @@ -9909,7 +9909,7 @@ static void ironlake_compute_dpll(struct intel_crtc *crtc,
> > > 
> > >  	fp = i9xx_dpll_compute_fp(&crtc_state->dpll);
> > > 
> > > -	if (ironlake_needs_fb_cb_tune(&crtc_state->dpll, factor))
> > > +	if (ilk_needs_fb_cb_tune(&crtc_state->dpll, factor))
> > >  		fp |= FP_CB_TUNE;
> > > 
> > >  	if (reduced_clock) {
> > > @@ -9989,8 +9989,8 @@ static void ironlake_compute_dpll(struct intel_crtc *crtc,
> > >  	crtc_state->dpll_hw_state.fp1 = fp2;
> > >  }
> > > 
> > > -static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
> > > -				       struct intel_crtc_state *crtc_state)
> > > +static int ilk_crtc_compute_clock(struct intel_crtc *crtc,
> > > +				  struct intel_crtc_state *crtc_state)
> > >  {
> > >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > >  	struct intel_atomic_state *state =
> > > @@ -10014,17 +10014,17 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
> > > 
> > >  		if (intel_is_dual_link_lvds(dev_priv)) {
> > >  			if (refclk == 100000)
> > > -				limit = &intel_limits_ironlake_dual_lvds_100m;
> > > +				limit = &ilk_limits_dual_lvds_100m;
> > >  			else
> > > -				limit = &intel_limits_ironlake_dual_lvds;
> > > +				limit = &ilk_limits_dual_lvds;
> > >  		} else {
> > >  			if (refclk == 100000)
> > > -				limit = &intel_limits_ironlake_single_lvds_100m;
> > > +				limit = &ilk_limits_single_lvds_100m;
> > >  			else
> > > -				limit = &intel_limits_ironlake_single_lvds;
> > > +				limit = &ilk_limits_single_lvds;
> > >  		}
> > >  	} else {
> > > -		limit = &intel_limits_ironlake_dac;
> > > +		limit = &ilk_limits_dac;
> > >  	}
> > > 
> > >  	if (!crtc_state->clock_set &&
> > > @@ -10034,7 +10034,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
> > >  		return -EINVAL;
> > >  	}
> > > 
> > > -	ironlake_compute_dpll(crtc, crtc_state, NULL);
> > > +	ilk_compute_dpll(crtc, crtc_state, NULL);
> > > 
> > >  	if (!intel_reserve_shared_dplls(state, crtc, NULL)) {
> > >  		DRM_DEBUG_KMS("failed to find PLL for pipe %c\n",
> > > @@ -10109,8 +10109,8 @@ void intel_dp_get_m_n(struct intel_crtc *crtc,
> > >  					     &pipe_config->dp_m2_n2);
> > >  }
> > > 
> > > -static void ironlake_get_fdi_m_n_config(struct intel_crtc *crtc,
> > > -					struct intel_crtc_state *pipe_config)
> > > +static void ilk_get_fdi_m_n_config(struct intel_crtc *crtc,
> > > +				   struct intel_crtc_state *pipe_config)
> > >  {
> > >  	intel_cpu_transcoder_get_m_n(crtc, pipe_config->cpu_transcoder,
> > >  				     &pipe_config->fdi_m_n, NULL);
> > > @@ -10276,8 +10276,8 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
> > >  	kfree(intel_fb);
> > >  }
> > > 
> > > -static void ironlake_get_pfit_config(struct intel_crtc *crtc,
> > > -				     struct intel_crtc_state *pipe_config)
> > > +static void ilk_get_pfit_config(struct intel_crtc *crtc,
> > > +				struct intel_crtc_state *pipe_config)
> > >  {
> > >  	struct drm_device *dev = crtc->base.dev;
> > >  	struct drm_i915_private *dev_priv = to_i915(dev);
> > > @@ -10300,8 +10300,8 @@ static void ironlake_get_pfit_config(struct intel_crtc *crtc,
> > >  	}
> > >  }
> > > 
> > > -static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
> > > -				     struct intel_crtc_state *pipe_config)
> > > +static bool ilk_get_pipe_config(struct intel_crtc *crtc,
> > > +				struct intel_crtc_state *pipe_config)
> > >  {
> > >  	struct drm_device *dev = crtc->base.dev;
> > >  	struct drm_i915_private *dev_priv = to_i915(dev);
> > > @@ -10372,7 +10372,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
> > >  		pipe_config->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>
> > >  					  FDI_DP_PORT_WIDTH_SHIFT) + 1;
> > > 
> > > -		ironlake_get_fdi_m_n_config(crtc, pipe_config);
> > > +		ilk_get_fdi_m_n_config(crtc, pipe_config);
> > > 
> > >  		if (HAS_PCH_IBX(dev_priv)) {
> > >  			/*
> > > @@ -10400,7 +10400,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
> > >  			((tmp & PLL_REF_SDVO_HDMI_MULTIPLIER_MASK)
> > >  			 >> PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT) + 1;
> > > 
> > > -		ironlake_pch_clock_get(crtc, pipe_config);
> > > +		ilk_pch_clock_get(crtc, pipe_config);
> > >  	} else {
> > >  		pipe_config->pixel_multiplier = 1;
> > >  	}
> > > @@ -10408,7 +10408,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
> > >  	intel_get_pipe_timings(crtc, pipe_config);
> > >  	intel_get_pipe_src_size(crtc, pipe_config);
> > > 
> > > -	ironlake_get_pfit_config(crtc, pipe_config);
> > > +	ilk_get_pfit_config(crtc, pipe_config);
> > > 
> > >  	ret = true;
> > > 
> > > @@ -10769,7 +10769,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,
> > >  		pipe_config->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>
> > >  					  FDI_DP_PORT_WIDTH_SHIFT) + 1;
> > > 
> > > -		ironlake_get_fdi_m_n_config(crtc, pipe_config);
> > > +		ilk_get_fdi_m_n_config(crtc, pipe_config);
> > >  	}
> > >  }
> > > 
> > > @@ -10921,7 +10921,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
> > >  		if (INTEL_GEN(dev_priv) >= 9)
> > >  			skl_get_pfit_config(crtc, pipe_config);
> > >  		else
> > > -			ironlake_get_pfit_config(crtc, pipe_config);
> > > +			ilk_get_pfit_config(crtc, pipe_config);
> > >  	}
> > > 
> > >  	if (hsw_crtc_supports_ips(crtc)) {
> > > @@ -11864,8 +11864,8 @@ int intel_dotclock_calculate(int link_freq,
> > >  	return div_u64(mul_u32_u32(m_n->link_m, link_freq), m_n->link_n);
> > >  }
> > > 
> > > -static void ironlake_pch_clock_get(struct intel_crtc *crtc,
> > > -				   struct intel_crtc_state *pipe_config)
> > > +static void ilk_pch_clock_get(struct intel_crtc *crtc,
> > > +			      struct intel_crtc_state *pipe_config)
> > >  {
> > >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > > 
> > > @@ -14472,9 +14472,9 @@ static void intel_pipe_fastset(const struct intel_crtc_state *old_crtc_state,
> > >  			skl_pfit_enable(new_crtc_state);
> > >  	} else if (HAS_PCH_SPLIT(dev_priv)) {
> > >  		if (new_crtc_state->pch_pfit.enabled)
> > > -			ironlake_pfit_enable(new_crtc_state);
> > > +			ilk_pfit_enable(new_crtc_state);
> > >  		else if (old_crtc_state->pch_pfit.enabled)
> > > -			ironlake_pfit_disable(old_crtc_state);
> > > +			ilk_pfit_disable(old_crtc_state);
> > >  	}
> > > 
> > >  	if (INTEL_GEN(dev_priv) >= 11)
> > > @@ -16826,13 +16826,13 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
> > >  		dev_priv->display.crtc_enable = hsw_crtc_enable;
> > >  		dev_priv->display.crtc_disable = hsw_crtc_disable;
> > >  	} else if (HAS_PCH_SPLIT(dev_priv)) {
> > > -		dev_priv->display.get_pipe_config = ironlake_get_pipe_config;
> > > +		dev_priv->display.get_pipe_config = ilk_get_pipe_config;
> > >  		dev_priv->display.get_initial_plane_config =
> > >  			i9xx_get_initial_plane_config;
> > >  		dev_priv->display.crtc_compute_clock =
> > > -			ironlake_crtc_compute_clock;
> > > -		dev_priv->display.crtc_enable = ironlake_crtc_enable;
> > > -		dev_priv->display.crtc_disable = ironlake_crtc_disable;
> > > +			ilk_crtc_compute_clock;
> > > +		dev_priv->display.crtc_enable = ilk_crtc_enable;
> > > +		dev_priv->display.crtc_disable = ilk_crtc_disable;
> > >  	} else if (IS_CHERRYVIEW(dev_priv)) {
> > >  		dev_priv->display.get_pipe_config = i9xx_get_pipe_config;
> > >  		dev_priv->display.get_initial_plane_config =
> > > @@ -16878,7 +16878,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
> > >  	}
> > > 
> > >  	if (IS_GEN(dev_priv, 5)) {
> > > -		dev_priv->display.fdi_link_train = ironlake_fdi_link_train;
> > > +		dev_priv->display.fdi_link_train = ilk_fdi_link_train;
> > >  	} else if (IS_GEN(dev_priv, 6)) {
> > >  		dev_priv->display.fdi_link_train = gen6_fdi_link_train;
> > >  	} else if (IS_IVYBRIDGE(dev_priv)) {
> > > diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> > > index 921a584c3284..bc2c5104f755 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display.h
> > > +++ b/drivers/gpu/drm/i915/display/intel_display.h
> > > @@ -521,7 +521,7 @@ int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data,
> > >  u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc);
> > >  void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state);
> > > 
> > > -int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp);
> > > +int ilk_get_lanes_required(int target_clock, int link_bw, int bpp);
> > >  void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
> > >  			 struct intel_digital_port *dport,
> > >  			 unsigned int expected_mask);
> > > @@ -579,7 +579,7 @@ void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
> > >  u16 skl_scaler_calc_phase(int sub, int scale, bool chroma_center);
> > >  int skl_update_scaler_crtc(struct intel_crtc_state *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 ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state);
> > >  u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
> > >  			const struct intel_plane_state *plane_state);
> > >  u32 glk_plane_color_ctl_crtc(const struct intel_crtc_state *crtc_state);
> > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> > > index 2f31d226c6eb..991f343579ef 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_dp.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> > > @@ -2509,7 +2509,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,
> > >  	 *
> > >  	 * CPT PCH is quite different, having many bits moved
> > >  	 * to the TRANS_DP_CTL register instead. That
> > > -	 * configuration happens (oddly) in ironlake_pch_enable
> > > +	 * configuration happens (oddly) in ilk_pch_enable
> > >  	 */
> > > 
> > >  	/* Preserve the BIOS-computed detected bit. This is
> > > @@ -2653,7 +2653,7 @@ static void edp_wait_backlight_off(struct intel_dp *intel_dp)
> > >   * is locked
> > >   */
> > > 
> > > -static  u32 ironlake_get_pp_control(struct intel_dp *intel_dp)
> > > +static  u32 ilk_get_pp_control(struct intel_dp *intel_dp)
> > >  {
> > >  	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> > >  	u32 control;
> > > @@ -2703,7 +2703,7 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)
> > >  	if (!edp_have_panel_power(intel_dp))
> > >  		wait_panel_power_cycle(intel_dp);
> > > 
> > > -	pp = ironlake_get_pp_control(intel_dp);
> > > +	pp = ilk_get_pp_control(intel_dp);
> > >  	pp |= EDP_FORCE_VDD;
> > > 
> > >  	pp_stat_reg = _pp_stat_reg(intel_dp);
> > > @@ -2768,7 +2768,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)
> > >  		      intel_dig_port->base.base.base.id,
> > >  		      intel_dig_port->base.base.name);
> > > 
> > > -	pp = ironlake_get_pp_control(intel_dp);
> > > +	pp = ilk_get_pp_control(intel_dp);
> > >  	pp &= ~EDP_FORCE_VDD;
> > > 
> > >  	pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
> > > @@ -2864,7 +2864,7 @@ static void edp_panel_on(struct intel_dp *intel_dp)
> > >  	wait_panel_power_cycle(intel_dp);
> > > 
> > >  	pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
> > > -	pp = ironlake_get_pp_control(intel_dp);
> > > +	pp = ilk_get_pp_control(intel_dp);
> > >  	if (IS_GEN(dev_priv, 5)) {
> > >  		/* ILK workaround: disable reset around power sequence */
> > >  		pp &= ~PANEL_POWER_RESET;
> > > @@ -2919,7 +2919,7 @@ static void edp_panel_off(struct intel_dp *intel_dp)
> > >  	WARN(!intel_dp->want_panel_vdd, "Need [ENCODER:%d:%s] VDD to turn off panel\n",
> > >  	     dig_port->base.base.base.id, dig_port->base.base.name);
> > > 
> > > -	pp = ironlake_get_pp_control(intel_dp);
> > > +	pp = ilk_get_pp_control(intel_dp);
> > >  	/* We need to switch off panel power _and_ force vdd, for otherwise some
> > >  	 * panels get very unhappy and cease to work. */
> > >  	pp &= ~(PANEL_POWER_ON | PANEL_POWER_RESET | EDP_FORCE_VDD |
> > > @@ -2968,7 +2968,7 @@ static void _intel_edp_backlight_on(struct intel_dp *intel_dp)
> > >  		i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
> > >  		u32 pp;
> > > 
> > > -		pp = ironlake_get_pp_control(intel_dp);
> > > +		pp = ilk_get_pp_control(intel_dp);
> > >  		pp |= EDP_BLC_ENABLE;
> > > 
> > >  		I915_WRITE(pp_ctrl_reg, pp);
> > > @@ -3004,7 +3004,7 @@ static void _intel_edp_backlight_off(struct intel_dp *intel_dp)
> > >  		i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
> > >  		u32 pp;
> > > 
> > > -		pp = ironlake_get_pp_control(intel_dp);
> > > +		pp = ilk_get_pp_control(intel_dp);
> > >  		pp &= ~EDP_BLC_ENABLE;
> > > 
> > >  		I915_WRITE(pp_ctrl_reg, pp);
> > > @@ -3042,7 +3042,7 @@ static void intel_edp_backlight_power(struct intel_connector *connector,
> > > 
> > >  	is_enabled = false;
> > >  	with_pps_lock(intel_dp, wakeref)
> > > -		is_enabled = ironlake_get_pp_control(intel_dp) & EDP_BLC_ENABLE;
> > > +		is_enabled = ilk_get_pp_control(intel_dp) & EDP_BLC_ENABLE;
> > >  	if (is_enabled == enable)
> > >  		return;
> > > 
> > > @@ -3079,8 +3079,8 @@ static void assert_edp_pll(struct drm_i915_private *dev_priv, bool state)
> > >  #define assert_edp_pll_enabled(d) assert_edp_pll((d), true)
> > >  #define assert_edp_pll_disabled(d) assert_edp_pll((d), false)
> > > 
> > > -static void ironlake_edp_pll_on(struct intel_dp *intel_dp,
> > > -				const struct intel_crtc_state *pipe_config)
> > > +static void ilk_edp_pll_on(struct intel_dp *intel_dp,
> > > +			   const struct intel_crtc_state *pipe_config)
> > >  {
> > >  	struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);
> > >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > > @@ -3119,8 +3119,8 @@ static void ironlake_edp_pll_on(struct intel_dp *intel_dp,
> > >  	udelay(200);
> > >  }
> > > 
> > > -static void ironlake_edp_pll_off(struct intel_dp *intel_dp,
> > > -				 const struct intel_crtc_state *old_crtc_state)
> > > +static void ilk_edp_pll_off(struct intel_dp *intel_dp,
> > > +			    const struct intel_crtc_state *old_crtc_state)
> > >  {
> > >  	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
> > >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > > @@ -3410,7 +3410,7 @@ static void g4x_post_disable_dp(struct intel_encoder *encoder,
> > > 
> > >  	/* Only ilk+ has port A */
> > >  	if (port == PORT_A)
> > > -		ironlake_edp_pll_off(intel_dp, old_crtc_state);
> > > +		ilk_edp_pll_off(intel_dp, old_crtc_state);
> > >  }
> > > 
> > >  static void vlv_post_disable_dp(struct intel_encoder *encoder,
> > > @@ -3615,7 +3615,7 @@ static void g4x_pre_enable_dp(struct intel_encoder *encoder,
> > > 
> > >  	/* Only ilk+ has port A */
> > >  	if (port == PORT_A)
> > > -		ironlake_edp_pll_on(intel_dp, pipe_config);
> > > +		ilk_edp_pll_on(intel_dp, pipe_config);
> > >  }
> > > 
> > >  static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)
> > > @@ -6693,7 +6693,7 @@ intel_pps_readout_hw_state(struct intel_dp *intel_dp, struct edp_power_seq *seq)
> > > 
> > >  	intel_pps_get_registers(intel_dp, &regs);
> > > 
> > > -	pp_ctl = ironlake_get_pp_control(intel_dp);
> > > +	pp_ctl = ilk_get_pp_control(intel_dp);
> > > 
> > >  	/* Ensure PPS is unlocked */
> > >  	if (!HAS_DDI(dev_priv))
> > > @@ -6863,7 +6863,7 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp,
> > >  	 * soon as the new power sequencer gets initialized.
> > >  	 */
> > >  	if (force_disable_vdd) {
> > > -		u32 pp = ironlake_get_pp_control(intel_dp);
> > > +		u32 pp = ilk_get_pp_control(intel_dp);
> > > 
> > >  		WARN(pp & PANEL_POWER_ON, "Panel power already on\n");
> > > 
> > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > > index 01b4608ab56c..cbf623154af1 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > > @@ -250,7 +250,7 @@ static void intel_mst_post_disable_dp(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);
> > > 
> > >  	/*
> > >  	 * From TGL spec: "If multi-stream slave transcoder: Configure
> > > diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> > > index ab61f88d1d33..d6e0d0be842e 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> > > @@ -126,8 +126,8 @@ static void i9xx_set_fifo_underrun_reporting(struct drm_device *dev,
> > >  	}
> > >  }
> > > 
> > > -static void ironlake_set_fifo_underrun_reporting(struct drm_device *dev,
> > > -						 enum pipe pipe, bool enable)
> > > +static void ilk_set_fifo_underrun_reporting(struct drm_device *dev,
> > > +					    enum pipe pipe, bool enable)
> > >  {
> > >  	struct drm_i915_private *dev_priv = to_i915(dev);
> > >  	u32 bit = (pipe == PIPE_A) ?
> > > @@ -264,7 +264,7 @@ static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev,
> > >  	if (HAS_GMCH(dev_priv))
> > >  		i9xx_set_fifo_underrun_reporting(dev, pipe, enable, old);
> > >  	else if (IS_GEN_RANGE(dev_priv, 5, 6))
> > > -		ironlake_set_fifo_underrun_reporting(dev, pipe, enable);
> > > +		ilk_set_fifo_underrun_reporting(dev, pipe, enable);
> > >  	else if (IS_GEN(dev_priv, 7))
> > >  		ivybridge_set_fifo_underrun_reporting(dev, pipe, enable, old);
> > >  	else if (INTEL_GEN(dev_priv) >= 8)
> > > diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
> > > index 1c51296646e0..ea7069e238d0 100644
> > > --- a/drivers/gpu/drm/i915/gt/intel_reset.c
> > > +++ b/drivers/gpu/drm/i915/gt/intel_reset.c
> > > @@ -251,9 +251,8 @@ static int g4x_do_reset(struct intel_gt *gt,
> > >  	return ret;
> > >  }
> > > 
> > > -static int ironlake_do_reset(struct intel_gt *gt,
> > > -			     intel_engine_mask_t engine_mask,
> > > -			     unsigned int retry)
> > > +static int ilk_do_reset(struct intel_gt *gt, intel_engine_mask_t engine_mask,
> > > +			unsigned int retry)
> > >  {
> > >  	struct intel_uncore *uncore = gt->uncore;
> > >  	int ret;
> > > @@ -597,7 +596,7 @@ static reset_func intel_get_gpu_reset(const struct intel_gt *gt)
> > >  	else if (INTEL_GEN(i915) >= 6)
> > >  		return gen6_reset_engines;
> > >  	else if (INTEL_GEN(i915) >= 5)
> > > -		return ironlake_do_reset;
> > > +		return ilk_do_reset;
> > >  	else if (IS_G4X(i915))
> > >  		return g4x_do_reset;
> > >  	else if (IS_G33(i915) || IS_PINEVIEW(i915))
> > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > > index d28468eaed57..0407229251bc 100644
> > > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > > @@ -1001,7 +1001,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
> > >  	return ret;
> > >  }
> > > 
> > > -static int ironlake_drpc_info(struct seq_file *m)
> > > +static int ilk_drpc_info(struct seq_file *m)
> > >  {
> > >  	struct drm_i915_private *i915 = node_to_i915(m->private);
> > >  	struct intel_uncore *uncore = &i915->uncore;
> > > @@ -1209,7 +1209,7 @@ static int i915_drpc_info(struct seq_file *m, void *unused)
> > >  		else if (INTEL_GEN(dev_priv) >= 6)
> > >  			err = gen6_drpc_info(m);
> > >  		else
> > > -			err = ironlake_drpc_info(m);
> > > +			err = ilk_drpc_info(m);
> > >  	}
> > > 
> > >  	return err;
> > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> > > index 42b79f577500..2d6324d2922a 100644
> > > --- a/drivers/gpu/drm/i915/i915_irq.c
> > > +++ b/drivers/gpu/drm/i915/i915_irq.c
> > > @@ -2031,7 +2031,7 @@ static void ivb_display_irq_handler(struct drm_i915_private *dev_priv,
> > >   * 4 - Process the interrupt(s) that had bits set in the IIRs.
> > >   * 5 - Re-enable Master Interrupt Control.
> > >   */
> > > -static irqreturn_t ironlake_irq_handler(int irq, void *arg)
> > > +static irqreturn_t ilk_irq_handler(int irq, void *arg)
> > >  {
> > >  	struct drm_i915_private *dev_priv = arg;
> > >  	u32 de_iir, gt_iir, de_ier, sde_ier = 0;
> > > @@ -2742,7 +2742,7 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
> > > 
> > >  /* drm_dma.h hooks
> > >  */
> > > -static void ironlake_irq_reset(struct drm_i915_private *dev_priv)
> > > +static void ilk_irq_reset(struct drm_i915_private *dev_priv)
> > >  {
> > >  	struct intel_uncore *uncore = &dev_priv->uncore;
> > > 
> > > @@ -3225,7 +3225,7 @@ static void ibx_irq_postinstall(struct drm_i915_private *dev_priv)
> > >  		spt_hpd_detection_setup(dev_priv);
> > >  }
> > > 
> > > -static void ironlake_irq_postinstall(struct drm_i915_private *dev_priv)
> > > +static void ilk_irq_postinstall(struct drm_i915_private *dev_priv)
> > >  {
> > >  	struct intel_uncore *uncore = &dev_priv->uncore;
> > >  	u32 display_mask, extra_mask;
> > > @@ -3980,7 +3980,7 @@ static irq_handler_t intel_irq_handler(struct drm_i915_private *dev_priv)
> > >  		else if (INTEL_GEN(dev_priv) >= 8)
> > >  			return gen8_irq_handler;
> > >  		else
> > > -			return ironlake_irq_handler;
> > > +			return ilk_irq_handler;
> > >  	}
> > >  }
> > > 
> > > @@ -4003,7 +4003,7 @@ static void intel_irq_reset(struct drm_i915_private *dev_priv)
> > >  		else if (INTEL_GEN(dev_priv) >= 8)
> > >  			gen8_irq_reset(dev_priv);
> > >  		else
> > > -			ironlake_irq_reset(dev_priv);
> > > +			ilk_irq_reset(dev_priv);
> > >  	}
> > >  }
> > > 
> > > @@ -4026,7 +4026,7 @@ static void intel_irq_postinstall(struct drm_i915_private *dev_priv)
> > >  		else if (INTEL_GEN(dev_priv) >= 8)
> > >  			gen8_irq_postinstall(dev_priv);
> > >  		else
> > > -			ironlake_irq_postinstall(dev_priv);
> > > +			ilk_irq_postinstall(dev_priv);
> > >  	}
> > >  }
> > > 
> > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > > index eab3b029e98a..6fb6760a1559 100644
> > > --- a/drivers/gpu/drm/i915/intel_pm.c
> > > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > > @@ -178,7 +178,7 @@ static void pnv_get_mem_freq(struct drm_i915_private *dev_priv)
> > >  	dev_priv->is_ddr3 = (tmp & CSHRDDR3CTL_DDR3) ? 1 : 0;
> > >  }
> > > 
> > > -static void i915_ironlake_get_mem_freq(struct drm_i915_private *dev_priv)
> > > +static void ilk_get_mem_freq(struct drm_i915_private *dev_priv)
> > >  {
> > >  	u16 ddrpll, csipll;
> > > 
> > > @@ -7182,7 +7182,7 @@ void intel_init_pm(struct drm_i915_private *dev_priv)
> > >  	if (IS_PINEVIEW(dev_priv))
> > >  		pnv_get_mem_freq(dev_priv);
> > >  	else if (IS_GEN(dev_priv, 5))
> > > -		i915_ironlake_get_mem_freq(dev_priv);
> > > +		ilk_get_mem_freq(dev_priv);
> > > 
> > >  	if (intel_has_sagv(dev_priv))
> > >  		skl_setup_sagv_block_time(dev_priv);
> > > --
> > > 2.24.0
> > > 
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> > 
> > -- 
> > Matt Roper
> > Graphics Software Engineer
> > VTT-OSGC Platform Enablement
> > Intel Corporation
> > (916) 356-2795

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx