aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_pm.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2013-07-05 04:57:19 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-08-05 13:03:58 -0400
commit1fda9882ca0ba134134c5bf04b8d4f4f06b52649 (patch)
treeefc825d9ed0b86cab8f23e1050eb236b86c11aaf /drivers/gpu/drm/i915/intel_pm.c
parent23297044ac70da5c87b1c1ef7d5cf32c84b2fd00 (diff)
drm/i915: Don't pass "mem_value" to ilk_compute_fbc_wm
The FBC watermark doesn't depend on the latency value, so no point in passing it in. Note: It actually depends upon the latency, but only through priv_val ... Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> [danvet: Add review comment from Paulo to the commit message.] 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.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 6259072a288c..1a80787f4258 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2260,8 +2260,7 @@ static uint32_t ilk_compute_cur_wm(struct hsw_pipe_wm_parameters *params,
2260 2260
2261/* Only for WM_LP. */ 2261/* Only for WM_LP. */
2262static uint32_t ilk_compute_fbc_wm(struct hsw_pipe_wm_parameters *params, 2262static uint32_t ilk_compute_fbc_wm(struct hsw_pipe_wm_parameters *params,
2263 uint32_t pri_val, 2263 uint32_t pri_val)
2264 uint32_t mem_value)
2265{ 2264{
2266 if (!params->active) 2265 if (!params->active)
2267 return 0; 2266 return 0;
@@ -2284,7 +2283,7 @@ static bool hsw_compute_lp_wm(uint32_t mem_value, struct hsw_wm_maximums *max,
2284 pri_val[pipe] = ilk_compute_pri_wm(p, mem_value, true); 2283 pri_val[pipe] = ilk_compute_pri_wm(p, mem_value, true);
2285 spr_val[pipe] = ilk_compute_spr_wm(p, mem_value); 2284 spr_val[pipe] = ilk_compute_spr_wm(p, mem_value);
2286 cur_val[pipe] = ilk_compute_cur_wm(p, mem_value); 2285 cur_val[pipe] = ilk_compute_cur_wm(p, mem_value);
2287 fbc_val[pipe] = ilk_compute_fbc_wm(p, pri_val[pipe], mem_value); 2286 fbc_val[pipe] = ilk_compute_fbc_wm(p, pri_val[pipe]);
2288 } 2287 }
2289 2288
2290 result->pri_val = max3(pri_val[0], pri_val[1], pri_val[2]); 2289 result->pri_val = max3(pri_val[0], pri_val[1], pri_val[2]);