drm/i915: Refactor wm_lp to level calculation
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 9 Oct 2013 16:18:01 +0000 (19:18 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 15 Oct 2013 08:18:54 +0000 (10:18 +0200)
On HSW the LP1,LP2,LP3 levels are either 1,2,3 or 1,3,4. We make the
conversion from LPn to to the level at one point current. Later we're
going to do it in a few places, so move it to a separate function.

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>
drivers/gpu/drm/i915/intel_pm.c

index a5503cd7a1c8587d547cd00af35222576e20cefc..9f33e37f8a2dbf91895654e4046fab13b65b1c98 100644 (file)
@@ -2705,6 +2705,12 @@ static void ilk_wm_merge(struct drm_device *dev,
        }
 }
 
+static int ilk_wm_lp_to_level(int wm_lp, const struct intel_pipe_wm *pipe_wm)
+{
+       /* LP1,LP2,LP3 levels are either 1,2,3 or 1,3,4 */
+       return wm_lp + (wm_lp >= 2 && pipe_wm->wm[4].enable);
+}
+
 static void hsw_compute_wm_results(struct drm_device *dev,
                                   const struct intel_pipe_wm *merged,
                                   struct hsw_wm_values *results)
@@ -2718,7 +2724,7 @@ static void hsw_compute_wm_results(struct drm_device *dev,
        for (wm_lp = 1; wm_lp <= 3; wm_lp++) {
                const struct intel_wm_level *r;
 
-               level = wm_lp + (wm_lp >= 2 && merged->wm[4].enable);
+               level = ilk_wm_lp_to_level(wm_lp, merged);
 
                r = &merged->wm[level];
                if (!r->enable)