From: Ville Syrjälä Date: Wed, 9 Oct 2013 16:18:10 +0000 (+0300) Subject: drm/i915: Rename ilk_check_wm to ilk_validate_wm_level X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d9395655b92bc80c33cb6fbacbefb9ebf16403d4;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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ä Reviewed-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- 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, max->fbc = ilk_fbc_wm_max(); } -static bool ilk_check_wm(int level, - const struct hsw_wm_maximums *max, - struct intel_wm_level *result) +static bool ilk_validate_wm_level(int level, + const struct hsw_wm_maximums *max, + struct intel_wm_level *result) { bool ret; @@ -2635,7 +2635,7 @@ static bool intel_compute_pipe_wm(struct drm_crtc *crtc, pipe_wm->linetime = hsw_compute_linetime_wm(dev, crtc); /* At least LP0 must be valid */ - return ilk_check_wm(0, &max, &pipe_wm->wm[0]); + return ilk_validate_wm_level(0, &max, &pipe_wm->wm[0]); } /* @@ -2680,7 +2680,7 @@ static void ilk_wm_merge(struct drm_device *dev, ilk_merge_wm_level(dev, level, wm); - if (!ilk_check_wm(level, max, wm)) + if (!ilk_validate_wm_level(level, max, wm)) break; /*