diff options
| author | Ville Syrjälä | 2013-08-30 13:30:25 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-09-10 11:17:19 +0200 |
| commit | ad0d6dc4859ffb769768b64942b6a110e92acd21 (patch) | |
| tree | e20c52735ba9c94319af139435708be58982b40e /drivers/gpu/drm/i915/intel_pm.c | |
| parent | drm/i915: Use ilk_compute_wm_level to compute WM_PIPE values (diff) | |
| download | kernel-qcow2-linux-ad0d6dc4859ffb769768b64942b6a110e92acd21.tar.gz kernel-qcow2-linux-ad0d6dc4859ffb769768b64942b6a110e92acd21.tar.xz kernel-qcow2-linux-ad0d6dc4859ffb769768b64942b6a110e92acd21.zip | |
drm/i915: Refactor max WM level
Pull the expected max WM level determinations out to a separate
function. Will have another user soon.
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.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 865d524f1e85..c1b601aacc3c 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2561,19 +2561,22 @@ static void intel_fixup_cur_wm_latency(struct drm_device *dev, uint16_t wm[5]) wm[3] *= 2; } -static void intel_print_wm_latency(struct drm_device *dev, - const char *name, - const uint16_t wm[5]) +static int ilk_wm_max_level(const struct drm_device *dev) { - int level, max_level; - /* how many WM levels are we expecting */ if (IS_HASWELL(dev)) - max_level = 4; + return 4; else if (INTEL_INFO(dev)->gen >= 6) - max_level = 3; + return 3; else - max_level = 2; + return 2; +} + +static void intel_print_wm_latency(struct drm_device *dev, + const char *name, + const uint16_t wm[5]) +{ + int level, max_level = ilk_wm_max_level(dev); for (level = 0; level <= max_level; level++) { unsigned int latency = wm[level]; |