forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915: Use the stored cursor and plane latencies properly

Browse source 
Rather than pass around the plane latencies, just grab them from
dev_priv nearer to where they're needed. Do the same for cursor
latencies.

v2: Add some comments about latency units

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>
This commit is contained in:
Ville Syrjälä 2013-08-01 16:18:51 +03:00 • committed by Daniel Vetter
commit 5b77da33c1
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
drivers/gpu/drm/i915/intel_pm.c
View file

@ -2270,7 +2270,8 @@ static uint32_t ilk_compute_fbc_wm(struct hsw_pipe_wm_parameters *params,
params->pri_bytes_per_pixel); params->pri_bytes_per_pixel);
} }
static bool hsw_compute_lp_wm(uint32_t mem_value, struct hsw_wm_maximums *max, static bool hsw_compute_lp_wm(struct drm_i915_private *dev_priv,
int level, struct hsw_wm_maximums *max,
struct hsw_pipe_wm_parameters *params, struct hsw_pipe_wm_parameters *params,
struct hsw_lp_wm_result *result) struct hsw_lp_wm_result *result)
{ {
@ -2279,10 +2280,14 @@ static bool hsw_compute_lp_wm(uint32_t mem_value, struct hsw_wm_maximums *max,
for (pipe = PIPE_A; pipe <= PIPE_C; pipe++) { for (pipe = PIPE_A; pipe <= PIPE_C; pipe++) {
struct hsw_pipe_wm_parameters *p = &params[pipe]; struct hsw_pipe_wm_parameters *p = &params[pipe];
/* WM1+ latency values stored in 0.5us units */
uint16_t pri_latency = dev_priv->wm.pri_latency[level] * 5;
uint16_t spr_latency = dev_priv->wm.spr_latency[level] * 5;
uint16_t cur_latency = dev_priv->wm.cur_latency[level] * 5;
pri_val[pipe] = ilk_compute_pri_wm(p, mem_value, true); pri_val[pipe] = ilk_compute_pri_wm(p, pri_latency, true);
spr_val[pipe] = ilk_compute_spr_wm(p, mem_value); spr_val[pipe] = ilk_compute_spr_wm(p, spr_latency);
cur_val[pipe] = ilk_compute_cur_wm(p, mem_value); cur_val[pipe] = ilk_compute_cur_wm(p, cur_latency);
fbc_val[pipe] = ilk_compute_fbc_wm(p, pri_val[pipe]); fbc_val[pipe] = ilk_compute_fbc_wm(p, pri_val[pipe]);
} }
@ -2305,14 +2310,18 @@ static bool hsw_compute_lp_wm(uint32_t mem_value, struct hsw_wm_maximums *max,
} }
static uint32_t hsw_compute_wm_pipe(struct drm_i915_private *dev_priv, static uint32_t hsw_compute_wm_pipe(struct drm_i915_private *dev_priv,
uint32_t mem_value, enum pipe pipe, enum pipe pipe,
struct hsw_pipe_wm_parameters *params) struct hsw_pipe_wm_parameters *params)
{ {
uint32_t pri_val, cur_val, spr_val; uint32_t pri_val, cur_val, spr_val;
/* WM0 latency values stored in 0.1us units */
uint16_t pri_latency = dev_priv->wm.pri_latency[0];
uint16_t spr_latency = dev_priv->wm.spr_latency[0];
uint16_t cur_latency = dev_priv->wm.cur_latency[0];
pri_val = ilk_compute_pri_wm(params, mem_value, false); pri_val = ilk_compute_pri_wm(params, pri_latency, false);
spr_val = ilk_compute_spr_wm(params, mem_value); spr_val = ilk_compute_spr_wm(params, spr_latency);
cur_val = ilk_compute_cur_wm(params, mem_value); cur_val = ilk_compute_cur_wm(params, cur_latency);
WARN(pri_val > 127, WARN(pri_val > 127,
"Primary WM error, mode not supported for pipe %c\n", "Primary WM error, mode not supported for pipe %c\n",
@ -2478,7 +2487,6 @@ static void hsw_compute_wm_parameters(struct drm_device *dev,
static void hsw_compute_wm_results(struct drm_device *dev, static void hsw_compute_wm_results(struct drm_device *dev,
struct hsw_pipe_wm_parameters *params, struct hsw_pipe_wm_parameters *params,
uint16_t *wm,
struct hsw_wm_maximums *lp_maximums, struct hsw_wm_maximums *lp_maximums,
struct hsw_wm_values *results) struct hsw_wm_values *results)
{ {
@ -2489,7 +2497,8 @@ static void hsw_compute_wm_results(struct drm_device *dev,
int level, max_level, wm_lp; int level, max_level, wm_lp;
for (level = 1; level <= 4; level++) for (level = 1; level <= 4; level++)
if (!hsw_compute_lp_wm(wm[level] * 5, lp_maximums, params, if (!hsw_compute_lp_wm(dev_priv, level,
lp_maximums, params,
&lp_results[level - 1])) &lp_results[level - 1]))
break; break;
max_level = level - 1; max_level = level - 1;
@ -2521,8 +2530,7 @@ static void hsw_compute_wm_results(struct drm_device *dev,
} }
for_each_pipe(pipe) for_each_pipe(pipe)
results->wm_pipe[pipe] = hsw_compute_wm_pipe(dev_priv, wm[0], results->wm_pipe[pipe] = hsw_compute_wm_pipe(dev_priv, pipe,
pipe,
&params[pipe]); &params[pipe]);
for_each_pipe(pipe) { for_each_pipe(pipe) {
@ -2665,11 +2673,9 @@ static void haswell_update_wm(struct drm_device *dev)
hsw_compute_wm_parameters(dev, params, &lp_max_1_2, &lp_max_5_6); hsw_compute_wm_parameters(dev, params, &lp_max_1_2, &lp_max_5_6);
hsw_compute_wm_results(dev, params, hsw_compute_wm_results(dev, params,
dev_priv->wm.pri_latency,
&lp_max_1_2, &results_1_2); &lp_max_1_2, &results_1_2);
if (lp_max_1_2.pri != lp_max_5_6.pri) { if (lp_max_1_2.pri != lp_max_5_6.pri) {
hsw_compute_wm_results(dev, params, hsw_compute_wm_results(dev, params,
dev_priv->wm.pri_latency,
&lp_max_5_6, &results_5_6); &lp_max_5_6, &results_5_6);
best_results = hsw_find_best_result(&results_1_2, &results_5_6); best_results = hsw_find_best_result(&results_1_2, &results_5_6);
} else { } else {