| Message ID | 20161013105826.9710-3-mahesh1.kumar@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Em Qui, 2016-10-13 às 16:28 +0530, Kumar, Mahesh escreveu: > From: Mahesh Kumar <mahesh1.kumar@intel.com> > > This patch implements new DDB allocation algorithm as per HW team > recommendation. This algo takecare of scenario where we allocate less > DDB > for the planes with lower relative pixel rate, but they require more > DDB > to work. > It also takes care of enabling same watermark level for each > plane, for efficient power saving. > > Changes since v1: > - Rebase on top of Paulo's patch series > > Changes since v2: > - Fix the for loop condition to enable WM > > Changes since v3: > - Fix crash in cursor i-g-t reported by Maarten > - Rebase after addressing Paulo's comments > - Few other ULT fixes > This will require a huge rebase due to the things that were already merged and those who are about to be merged. Also, this is a general improvement while the other patches are bug fixes. Can you please move this to the end of the series? I'd really like to get the other things merged first, in case we decide to backport the fixes. > Signed-off-by: Mahesh Kumar <mahesh1.kumar@intel.com> > --- > drivers/gpu/drm/i915/intel_pm.c | 149 +++++++++++++++++++++--------- > ---------- > 1 file changed, 79 insertions(+), 70 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c > b/drivers/gpu/drm/i915/intel_pm.c > index 098336d..84ec6b1 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3344,6 +3344,7 @@ skl_ddb_min_alloc(const struct drm_plane_state > *pstate, > > static int > skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, > + struct skl_pipe_wm *pipe_wm, > struct skl_ddb_allocation *ddb /* out */) > { > struct drm_atomic_state *state = cstate->base.state; > @@ -3359,8 +3360,12 @@ skl_allocate_pipe_ddb(struct intel_crtc_state > *cstate, > uint16_t *minimum = cstate->wm.skl.minimum_blocks; > uint16_t *y_minimum = cstate->wm.skl.minimum_y_blocks; > unsigned int total_data_rate; > + uint16_t total_min_blocks = 0; > + uint16_t total_level_ddb = 0; > int num_active; > - int id, i; > + int max_level, level; > + int id, i, ret = 0; > + > > if (WARN_ON(!state)) > return 0; > @@ -3409,19 +3414,42 @@ skl_allocate_pipe_ddb(struct intel_crtc_state > *cstate, > } > > for (i = 0; i < PLANE_CURSOR; i++) { > - alloc_size -= minimum[i]; > - alloc_size -= y_minimum[i]; > + total_min_blocks += minimum[i]; > + total_min_blocks += y_minimum[i]; > } > > - /* > - * 2. Distribute the remaining space in proportion to the > amount of > - * data each plane needs to fetch from memory. > - * > - * FIXME: we may not allocate every single block here. > - */ > + for (level = ilk_wm_max_level(dev); level >= 0; level--) { > + total_level_ddb = 0; > + for (i = 0; i < PLANE_CURSOR; i++) { > + /* > + * TODO: We should calculate watermark > values for Y/UV > + * plane both in case of NV12 format and use > both values > + * for ddb calculation, As NV12 is disabled > as of now. > + * using only single plane value here. > + */ > + uint16_t min = minimum[i] + y_minimum[i]; > + uint16_t plane_level_ddb_wm = > + max(pipe_wm- > >wm[level].plane_res_b[i], min); > + total_level_ddb += plane_level_ddb_wm; > + } > + > + if (total_level_ddb <= alloc_size) > + break; > + } > + > + if ((level < 0) || (total_min_blocks > alloc_size)) { > + DRM_DEBUG_KMS("Requested display configuration > exceeds system DDB limitations"); > + DRM_DEBUG_KMS("minimum required %d/%d\n", (level < > 0) ? > + total_level_ddb : total_min_blocks, > alloc_size); > + ret = -EINVAL; > + goto exit; > + } > + max_level = level; > + alloc_size -= total_level_ddb; > + > total_data_rate = skl_get_total_relative_data_rate(cstate); > if (total_data_rate == 0) > - return 0; > + goto exit; > > start = alloc->start; > for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) { > @@ -3436,7 +3464,8 @@ skl_allocate_pipe_ddb(struct intel_crtc_state > *cstate, > * promote the expression to 64 bits to avoid > overflowing, the > * result is < available as data_rate / > total_data_rate < 1 > */ > - plane_blocks = minimum[id]; > + plane_blocks = max(pipe_wm- > >wm[max_level].plane_res_b[id], > + minimum[id]); > plane_blocks += div_u64((uint64_t)alloc_size * > data_rate, > total_data_rate); > > @@ -3444,12 +3473,13 @@ skl_allocate_pipe_ddb(struct intel_crtc_state > *cstate, > if (data_rate) { > ddb->plane[pipe][id].start = start; > ddb->plane[pipe][id].end = start + > plane_blocks; > + start += plane_blocks; > } > > - start += plane_blocks; > - > /* > * allocation for y_plane part of planar format: > + * TODO: Once we start calculating watermark values > for Y/UV > + * plane both consider it for initial allowed wm > blocks. > */ > y_data_rate = cstate->wm.skl.plane_y_data_rate[id]; > > @@ -3460,12 +3490,29 @@ skl_allocate_pipe_ddb(struct intel_crtc_state > *cstate, > if (y_data_rate) { > ddb->y_plane[pipe][id].start = start; > ddb->y_plane[pipe][id].end = start + > y_plane_blocks; > + start += y_plane_blocks; > } > > - start += y_plane_blocks; > + /* > + * Now enable all levels in WM structure which can > be enabled > + * using current DDB allocation > + */ > + for (i = ilk_wm_max_level(dev); i >= 0; i--) { > + if (i > max_level || pipe_wm- > >wm[i].plane_res_l[id] > 31 > + || pipe_wm- > >wm[i].plane_res_b[id] == 0 > + || pipe_wm- > >wm[i].plane_res_b[id] >= > + skl_ddb_entry_size(&ddb- > >plane[pipe][id])) { > + pipe_wm->wm[i].plane_en[id] = false; > + pipe_wm->wm[i].plane_res_b[id] = 0; > + pipe_wm->wm[i].plane_res_l[id] = 0; > + } else { > + pipe_wm->wm[i].plane_en[id] = true; > + } > + } > } > > - return 0; > +exit: > + return ret; > } > > static uint32_t skl_pipe_pixel_rate(const struct intel_crtc_state > *config) > @@ -3536,11 +3583,9 @@ static uint32_t > skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *cst > static int skl_compute_plane_wm(const struct drm_i915_private > *dev_priv, > struct intel_crtc_state *cstate, > struct intel_plane_state > *intel_pstate, > - uint16_t ddb_allocation, > int level, > uint16_t *out_blocks, /* out */ > - uint8_t *out_lines, /* out */ > - bool *enabled /* out */) > + uint8_t *out_lines /* out */) > { > struct drm_plane_state *pstate = &intel_pstate->base; > struct drm_framebuffer *fb = pstate->fb; > @@ -3554,10 +3599,8 @@ static int skl_compute_plane_wm(const struct > drm_i915_private *dev_priv, > uint32_t plane_pixel_rate; > uint32_t y_tile_minimum, y_min_scanlines; > > - if (latency == 0 || !cstate->base.active || !intel_pstate- > >base.visible) { > - *enabled = false; > + if (latency == 0 || !cstate->base.active || !intel_pstate- > >base.visible) > return 0; > - } > > width = drm_rect_width(&intel_pstate->base.src) >> 16; > height = drm_rect_height(&intel_pstate->base.src) >> 16; > @@ -3642,47 +3685,22 @@ static int skl_compute_plane_wm(const struct > drm_i915_private *dev_priv, > } > } > > - if (res_blocks >= ddb_allocation || res_lines > 31) { > - *enabled = false; > - > - /* > - * If there are no valid level 0 watermarks, then we > can't > - * support this display configuration. > - */ > - if (level) { > - return 0; > - } else { > - DRM_DEBUG_KMS("Requested display > configuration exceeds system watermark limitations\n"); > - DRM_DEBUG_KMS("Plane %d.%d: blocks required > = %u/%u, lines required = %u/31\n", > - to_intel_crtc(cstate- > >base.crtc)->pipe, > - skl_wm_plane_id(to_intel_plane > (pstate->plane)), > - res_blocks, ddb_allocation, > res_lines); > - > - return -EINVAL; > - } > - } > - > *out_blocks = res_blocks; > *out_lines = res_lines; > - *enabled = true; > > return 0; > } > > static int > skl_compute_wm_level(const struct drm_i915_private *dev_priv, > - struct skl_ddb_allocation *ddb, > struct intel_crtc_state *cstate, > int level, > struct skl_wm_level *result) > { > struct drm_atomic_state *state = cstate->base.state; > - struct intel_crtc *intel_crtc = to_intel_crtc(cstate- > >base.crtc); > struct drm_plane *plane; > struct intel_plane *intel_plane; > struct intel_plane_state *intel_pstate; > - uint16_t ddb_blocks; > - enum pipe pipe = intel_crtc->pipe; > int ret; > > /* > @@ -3721,16 +3739,12 @@ skl_compute_wm_level(const struct > drm_i915_private *dev_priv, > > WARN_ON(!intel_pstate->base.fb); > > - ddb_blocks = skl_ddb_entry_size(&ddb- > >plane[pipe][i]); > - > ret = skl_compute_plane_wm(dev_priv, > cstate, > intel_pstate, > - ddb_blocks, > level, > &result->plane_res_b[i], > - &result->plane_res_l[i], > - &result->plane_en[i]); > + &result->plane_res_l[i]); > if (ret) > return ret; > } > @@ -3779,11 +3793,15 @@ static int skl_build_pipe_wm(struct > intel_crtc_state *cstate, > int ret; > > for (level = 0; level <= max_level; level++) { > - ret = skl_compute_wm_level(dev_priv, ddb, cstate, > + ret = skl_compute_wm_level(dev_priv, cstate, > level, &pipe_wm- > >wm[level]); > if (ret) > return ret; > } > + ret = skl_allocate_pipe_ddb(cstate, pipe_wm, ddb); > + if (ret) > + return ret; > + > pipe_wm->linetime = skl_compute_linetime_wm(cstate); > > skl_compute_transition_wm(cstate, &pipe_wm->trans_wm); > @@ -4006,13 +4024,12 @@ skl_ddb_add_affected_planes(struct > intel_crtc_state *cstate) > } > > static int > -skl_compute_ddb(struct drm_atomic_state *state) > +skl_include_affected_pipes(struct drm_atomic_state *state) > { > struct drm_device *dev = state->dev; > struct drm_i915_private *dev_priv = to_i915(dev); > struct intel_atomic_state *intel_state = > to_intel_atomic_state(state); > struct intel_crtc *intel_crtc; > - struct skl_ddb_allocation *ddb = &intel_state- > >wm_results.ddb; > uint32_t realloc_pipes = pipes_modified(state); > int ret; > > @@ -4064,14 +4081,6 @@ skl_compute_ddb(struct drm_atomic_state > *state) > cstate = intel_atomic_get_crtc_state(state, > intel_crtc); > if (IS_ERR(cstate)) > return PTR_ERR(cstate); > - > - ret = skl_allocate_pipe_ddb(cstate, ddb); > - if (ret) > - return ret; > - > - ret = skl_ddb_add_affected_planes(cstate); > - if (ret) > - return ret; > } > > return 0; > @@ -4122,19 +4131,15 @@ skl_compute_wm(struct drm_atomic_state > *state) > /* Clear all dirty flags */ > results->dirty_pipes = 0; > > - ret = skl_compute_ddb(state); > + ret = skl_include_affected_pipes(state); > if (ret) > return ret; > > /* > * Calculate WM's for all pipes that are part of this > transaction. > - * Note that the DDB allocation above may have added more > CRTC's that > - * weren't otherwise being modified (and set bits in > dirty_pipes) if > - * pipe allocations had to change. > - * > - * FIXME: Now that we're doing this in the atomic check > phase, we > - * should allow skl_update_pipe_wm() to return failure in > cases where > - * no suitable watermark values can be found. > + * Note that affected pipe calculation above may have added > more > + * CRTC's that weren't otherwise being modified (and set > bits in > + * dirty_pipes) if pipe allocations had to change. > */ > for_each_crtc_in_state(state, crtc, cstate, i) { > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > @@ -4150,6 +4155,10 @@ skl_compute_wm(struct drm_atomic_state *state) > if (changed) > results->dirty_pipes |= drm_crtc_mask(crtc); > > + ret = skl_ddb_add_affected_planes(intel_cstate); > + if (ret) > + return ret; > + > if ((results->dirty_pipes & drm_crtc_mask(crtc)) == > 0) > /* This pipe's WM's did not change */ > continue;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 098336d..84ec6b1 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3344,6 +3344,7 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate, static int skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, + struct skl_pipe_wm *pipe_wm, struct skl_ddb_allocation *ddb /* out */) { struct drm_atomic_state *state = cstate->base.state; @@ -3359,8 +3360,12 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, uint16_t *minimum = cstate->wm.skl.minimum_blocks; uint16_t *y_minimum = cstate->wm.skl.minimum_y_blocks; unsigned int total_data_rate; + uint16_t total_min_blocks = 0; + uint16_t total_level_ddb = 0; int num_active; - int id, i; + int max_level, level; + int id, i, ret = 0; + if (WARN_ON(!state)) return 0; @@ -3409,19 +3414,42 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, } for (i = 0; i < PLANE_CURSOR; i++) { - alloc_size -= minimum[i]; - alloc_size -= y_minimum[i]; + total_min_blocks += minimum[i]; + total_min_blocks += y_minimum[i]; } - /* - * 2. Distribute the remaining space in proportion to the amount of - * data each plane needs to fetch from memory. - * - * FIXME: we may not allocate every single block here. - */ + for (level = ilk_wm_max_level(dev); level >= 0; level--) { + total_level_ddb = 0; + for (i = 0; i < PLANE_CURSOR; i++) { + /* + * TODO: We should calculate watermark values for Y/UV + * plane both in case of NV12 format and use both values + * for ddb calculation, As NV12 is disabled as of now. + * using only single plane value here. + */ + uint16_t min = minimum[i] + y_minimum[i]; + uint16_t plane_level_ddb_wm = + max(pipe_wm->wm[level].plane_res_b[i], min); + total_level_ddb += plane_level_ddb_wm; + } + + if (total_level_ddb <= alloc_size) + break; + } + + if ((level < 0) || (total_min_blocks > alloc_size)) { + DRM_DEBUG_KMS("Requested display configuration exceeds system DDB limitations"); + DRM_DEBUG_KMS("minimum required %d/%d\n", (level < 0) ? + total_level_ddb : total_min_blocks, alloc_size); + ret = -EINVAL; + goto exit; + } + max_level = level; + alloc_size -= total_level_ddb; + total_data_rate = skl_get_total_relative_data_rate(cstate); if (total_data_rate == 0) - return 0; + goto exit; start = alloc->start; for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) { @@ -3436,7 +3464,8 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, * promote the expression to 64 bits to avoid overflowing, the * result is < available as data_rate / total_data_rate < 1 */ - plane_blocks = minimum[id]; + plane_blocks = max(pipe_wm->wm[max_level].plane_res_b[id], + minimum[id]); plane_blocks += div_u64((uint64_t)alloc_size * data_rate, total_data_rate); @@ -3444,12 +3473,13 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, if (data_rate) { ddb->plane[pipe][id].start = start; ddb->plane[pipe][id].end = start + plane_blocks; + start += plane_blocks; } - start += plane_blocks; - /* * allocation for y_plane part of planar format: + * TODO: Once we start calculating watermark values for Y/UV + * plane both consider it for initial allowed wm blocks. */ y_data_rate = cstate->wm.skl.plane_y_data_rate[id]; @@ -3460,12 +3490,29 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, if (y_data_rate) { ddb->y_plane[pipe][id].start = start; ddb->y_plane[pipe][id].end = start + y_plane_blocks; + start += y_plane_blocks; } - start += y_plane_blocks; + /* + * Now enable all levels in WM structure which can be enabled + * using current DDB allocation + */ + for (i = ilk_wm_max_level(dev); i >= 0; i--) { + if (i > max_level || pipe_wm->wm[i].plane_res_l[id] > 31 + || pipe_wm->wm[i].plane_res_b[id] == 0 + || pipe_wm->wm[i].plane_res_b[id] >= + skl_ddb_entry_size(&ddb->plane[pipe][id])) { + pipe_wm->wm[i].plane_en[id] = false; + pipe_wm->wm[i].plane_res_b[id] = 0; + pipe_wm->wm[i].plane_res_l[id] = 0; + } else { + pipe_wm->wm[i].plane_en[id] = true; + } + } } - return 0; +exit: + return ret; } static uint32_t skl_pipe_pixel_rate(const struct intel_crtc_state *config) @@ -3536,11 +3583,9 @@ static uint32_t skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *cst static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, struct intel_crtc_state *cstate, struct intel_plane_state *intel_pstate, - uint16_t ddb_allocation, int level, uint16_t *out_blocks, /* out */ - uint8_t *out_lines, /* out */ - bool *enabled /* out */) + uint8_t *out_lines /* out */) { struct drm_plane_state *pstate = &intel_pstate->base; struct drm_framebuffer *fb = pstate->fb; @@ -3554,10 +3599,8 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, uint32_t plane_pixel_rate; uint32_t y_tile_minimum, y_min_scanlines; - if (latency == 0 || !cstate->base.active || !intel_pstate->base.visible) { - *enabled = false; + if (latency == 0 || !cstate->base.active || !intel_pstate->base.visible) return 0; - } width = drm_rect_width(&intel_pstate->base.src) >> 16; height = drm_rect_height(&intel_pstate->base.src) >> 16; @@ -3642,47 +3685,22 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, } } - if (res_blocks >= ddb_allocation || res_lines > 31) { - *enabled = false; - - /* - * If there are no valid level 0 watermarks, then we can't - * support this display configuration. - */ - if (level) { - return 0; - } else { - DRM_DEBUG_KMS("Requested display configuration exceeds system watermark limitations\n"); - DRM_DEBUG_KMS("Plane %d.%d: blocks required = %u/%u, lines required = %u/31\n", - to_intel_crtc(cstate->base.crtc)->pipe, - skl_wm_plane_id(to_intel_plane(pstate->plane)), - res_blocks, ddb_allocation, res_lines); - - return -EINVAL; - } - } - *out_blocks = res_blocks; *out_lines = res_lines; - *enabled = true; return 0; } static int skl_compute_wm_level(const struct drm_i915_private *dev_priv, - struct skl_ddb_allocation *ddb, struct intel_crtc_state *cstate, int level, struct skl_wm_level *result) { struct drm_atomic_state *state = cstate->base.state; - struct intel_crtc *intel_crtc = to_intel_crtc(cstate->base.crtc); struct drm_plane *plane; struct intel_plane *intel_plane; struct intel_plane_state *intel_pstate; - uint16_t ddb_blocks; - enum pipe pipe = intel_crtc->pipe; int ret; /* @@ -3721,16 +3739,12 @@ skl_compute_wm_level(const struct drm_i915_private *dev_priv, WARN_ON(!intel_pstate->base.fb); - ddb_blocks = skl_ddb_entry_size(&ddb->plane[pipe][i]); - ret = skl_compute_plane_wm(dev_priv, cstate, intel_pstate, - ddb_blocks, level, &result->plane_res_b[i], - &result->plane_res_l[i], - &result->plane_en[i]); + &result->plane_res_l[i]); if (ret) return ret; } @@ -3779,11 +3793,15 @@ static int skl_build_pipe_wm(struct intel_crtc_state *cstate, int ret; for (level = 0; level <= max_level; level++) { - ret = skl_compute_wm_level(dev_priv, ddb, cstate, + ret = skl_compute_wm_level(dev_priv, cstate, level, &pipe_wm->wm[level]); if (ret) return ret; } + ret = skl_allocate_pipe_ddb(cstate, pipe_wm, ddb); + if (ret) + return ret; + pipe_wm->linetime = skl_compute_linetime_wm(cstate); skl_compute_transition_wm(cstate, &pipe_wm->trans_wm); @@ -4006,13 +4024,12 @@ skl_ddb_add_affected_planes(struct intel_crtc_state *cstate) } static int -skl_compute_ddb(struct drm_atomic_state *state) +skl_include_affected_pipes(struct drm_atomic_state *state) { struct drm_device *dev = state->dev; struct drm_i915_private *dev_priv = to_i915(dev); struct intel_atomic_state *intel_state = to_intel_atomic_state(state); struct intel_crtc *intel_crtc; - struct skl_ddb_allocation *ddb = &intel_state->wm_results.ddb; uint32_t realloc_pipes = pipes_modified(state); int ret; @@ -4064,14 +4081,6 @@ skl_compute_ddb(struct drm_atomic_state *state) cstate = intel_atomic_get_crtc_state(state, intel_crtc); if (IS_ERR(cstate)) return PTR_ERR(cstate); - - ret = skl_allocate_pipe_ddb(cstate, ddb); - if (ret) - return ret; - - ret = skl_ddb_add_affected_planes(cstate); - if (ret) - return ret; } return 0; @@ -4122,19 +4131,15 @@ skl_compute_wm(struct drm_atomic_state *state) /* Clear all dirty flags */ results->dirty_pipes = 0; - ret = skl_compute_ddb(state); + ret = skl_include_affected_pipes(state); if (ret) return ret; /* * Calculate WM's for all pipes that are part of this transaction. - * Note that the DDB allocation above may have added more CRTC's that - * weren't otherwise being modified (and set bits in dirty_pipes) if - * pipe allocations had to change. - * - * FIXME: Now that we're doing this in the atomic check phase, we - * should allow skl_update_pipe_wm() to return failure in cases where - * no suitable watermark values can be found. + * Note that affected pipe calculation above may have added more + * CRTC's that weren't otherwise being modified (and set bits in + * dirty_pipes) if pipe allocations had to change. */ for_each_crtc_in_state(state, crtc, cstate, i) { struct intel_crtc *intel_crtc = to_intel_crtc(crtc); @@ -4150,6 +4155,10 @@ skl_compute_wm(struct drm_atomic_state *state) if (changed) results->dirty_pipes |= drm_crtc_mask(crtc); + ret = skl_ddb_add_affected_planes(intel_cstate); + if (ret) + return ret; + if ((results->dirty_pipes & drm_crtc_mask(crtc)) == 0) /* This pipe's WM's did not change */ continue;