aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2013-10-09 12:18:10 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-15 13:01:30 -0400
commitd9395655b92bc80c33cb6fbacbefb9ebf16403d4 (patch)
treec2ddec8c3cba5f1af9a0b03fea4bc711afda42a4
parent34982fe1303b7e4f24fb8a0a238ebffc8135af84 (diff)
drm/i915: Rename ilk_check_wm to ilk_validate_wm_level
Makes the behaviour of the function 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>
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 493a31334158..cdd78f69a28b 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2383,9 +2383,9 @@ static void ilk_compute_wm_maximums(struct drm_device *dev,
2383 max->fbc = ilk_fbc_wm_max(); 2383 max->fbc = ilk_fbc_wm_max();
2384} 2384}
2385 2385
2386static bool ilk_check_wm(int level, 2386static bool ilk_validate_wm_level(int level,
2387 const struct hsw_wm_maximums *max, 2387 const struct hsw_wm_maximums *max,
2388 struct intel_wm_level *result) 2388 struct intel_wm_level *result)
2389{ 2389{
2390 bool ret; 2390 bool ret;
2391 2391
@@ -2635,7 +2635,7 @@ static bool intel_compute_pipe_wm(struct drm_crtc *crtc,
2635 pipe_wm->linetime = hsw_compute_linetime_wm(dev, crtc); 2635 pipe_wm->linetime = hsw_compute_linetime_wm(dev, crtc);
2636 2636
2637 /* At least LP0 must be valid */ 2637 /* At least LP0 must be valid */
2638 return ilk_check_wm(0, &max, &pipe_wm->wm[0]); 2638 return ilk_validate_wm_level(0, &max, &pipe_wm->wm[0]);
2639} 2639}
2640 2640
2641/* 2641/*
@@ -2680,7 +2680,7 @@ static void ilk_wm_merge(struct drm_device *dev,
2680 2680
2681 ilk_merge_wm_level(dev, level, wm); 2681 ilk_merge_wm_level(dev, level, wm);
2682 2682
2683 if (!ilk_check_wm(level, max, wm)) 2683 if (!ilk_validate_wm_level(level, max, wm))
2684 break; 2684 break;
2685 2685
2686 /* 2686 /*