Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9395655 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Rename ilk_check_wm to ilk_validate_wm_level 



Makes the behaviour of the function more clear.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 34982fe1

drivers/gpu/drm/i915/intel_pm.c

+5 −5
Original line number Diff line number Diff line
@@ -2383,7 +2383,7 @@ static void ilk_compute_wm_maximums(struct drm_device *dev, 
	max->fbc = ilk_fbc_wm_max();

}



static bool ilk_check_wm(int level,

static bool ilk_validate_wm_level(int level,

				  const struct hsw_wm_maximums *max,

				  struct intel_wm_level *result)

{
@@ -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;



		/*