aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_pm.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2013-10-09 12:18:09 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-15 13:01:30 -0400
commit34982fe1303b7e4f24fb8a0a238ebffc8135af84 (patch)
tree46811de60e6e677d0743ae41b5f4d56ee7674584 /drivers/gpu/drm/i915/intel_pm.c
parent1996d624403483aa8b4192f39584b0d9421ed6a9 (diff)
drm/i915: Rename ilk_wm_max to ilk_compute_wm_maximums
Makes the intention more clear. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 63b3f5e4b258..493a31334158 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2371,11 +2371,11 @@ static unsigned int ilk_fbc_wm_max(void)
2371 return 15; 2371 return 15;
2372} 2372}
2373 2373
2374static void ilk_wm_max(struct drm_device *dev, 2374static void ilk_compute_wm_maximums(struct drm_device *dev,
2375 int level, 2375 int level,
2376 const struct intel_wm_config *config, 2376 const struct intel_wm_config *config,
2377 enum intel_ddb_partitioning ddb_partitioning, 2377 enum intel_ddb_partitioning ddb_partitioning,
2378 struct hsw_wm_maximums *max) 2378 struct hsw_wm_maximums *max)
2379{ 2379{
2380 max->pri = ilk_plane_wm_max(dev, level, config, ddb_partitioning, false); 2380 max->pri = ilk_plane_wm_max(dev, level, config, ddb_partitioning, false);
2381 max->spr = ilk_plane_wm_max(dev, level, config, ddb_partitioning, true); 2381 max->spr = ilk_plane_wm_max(dev, level, config, ddb_partitioning, true);
@@ -2626,7 +2626,7 @@ static bool intel_compute_pipe_wm(struct drm_crtc *crtc,
2626 struct hsw_wm_maximums max; 2626 struct hsw_wm_maximums max;
2627 2627
2628 /* LP0 watermarks always use 1/2 DDB partitioning */ 2628 /* LP0 watermarks always use 1/2 DDB partitioning */
2629 ilk_wm_max(dev, 0, &config, INTEL_DDB_PART_1_2, &max); 2629 ilk_compute_wm_maximums(dev, 0, &config, INTEL_DDB_PART_1_2, &max);
2630 2630
2631 for (level = 0; level <= max_level; level++) 2631 for (level = 0; level <= max_level; level++)
2632 ilk_compute_wm_level(dev_priv, level, params, 2632 ilk_compute_wm_level(dev_priv, level, params,
@@ -2927,12 +2927,12 @@ static void haswell_update_wm(struct drm_crtc *crtc)
2927 2927
2928 intel_crtc->wm.active = pipe_wm; 2928 intel_crtc->wm.active = pipe_wm;
2929 2929
2930 ilk_wm_max(dev, 1, &config, INTEL_DDB_PART_1_2, &max); 2930 ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_1_2, &max);
2931 ilk_wm_merge(dev, &max, &lp_wm_1_2); 2931 ilk_wm_merge(dev, &max, &lp_wm_1_2);
2932 2932
2933 /* 5/6 split only in single pipe config on IVB+ */ 2933 /* 5/6 split only in single pipe config on IVB+ */
2934 if (INTEL_INFO(dev)->gen >= 7 && config.num_pipes_active == 1) { 2934 if (INTEL_INFO(dev)->gen >= 7 && config.num_pipes_active == 1) {
2935 ilk_wm_max(dev, 1, &config, INTEL_DDB_PART_5_6, &max); 2935 ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_5_6, &max);
2936 ilk_wm_merge(dev, &max, &lp_wm_5_6); 2936 ilk_wm_merge(dev, &max, &lp_wm_5_6);
2937 2937
2938 best_lp_wm = hsw_find_best_result(dev, &lp_wm_1_2, &lp_wm_5_6); 2938 best_lp_wm = hsw_find_best_result(dev, &lp_wm_1_2, &lp_wm_5_6);