| From 249abd555d4080ed5487f704077f1d05ca724632 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Fri, 30 Aug 2013 14:30:25 +0300 |
| Subject: drm/i915: Refactor max WM level |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| (cherry picked from commit ad0d6dc4859ffb769768b64942b6a110e92acd21) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_pm.c | 19 +++++++++++-------- |
| 1 file changed, 11 insertions(+), 8 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c |
| index c1c5ce03e7d6..2b7f76be01c3 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]; |
| -- |
| 1.8.5.rc3 |
| |
