diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-03-05 18:36:08 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-03-12 19:18:55 +0300 |
| commit | 18ffd6de8c50fdbb925e421f70ea0d1a60f81528 (patch) | |
| tree | 534869fddb4b7d93b0dd9611e8c382ac8c9a3fdb /drivers/gpu/drm/i915/intel_pm.c | |
| parent | f0dfaa982b7936dfd751502bf89fbd8c07e02943 (diff) | |
| download | linux-18ffd6de8c50fdbb925e421f70ea0d1a60f81528.tar.xz | |
drm/i915: Calculate min_ddb_alloc for trans_wm
Let's make all the "do we have enough DDB for this WM level?"
checks use min_ddb_alloc. To achieve that we need to populate
this for the transition watermarks as well.
Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210305153610.12177-5-ville.syrjala@linux.intel.com
Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 986ef5eff374..ee11447f50aa 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4986,13 +4986,13 @@ skl_allocate_plane_ddb(struct intel_atomic_state *state, struct skl_plane_wm *wm = &crtc_state->wm.skl.optimal.planes[plane_id]; - if (wm->trans_wm.plane_res_b >= total[plane_id]) + if (wm->trans_wm.min_ddb_alloc > total[plane_id]) memset(&wm->trans_wm, 0, sizeof(wm->trans_wm)); if (wm->sagv.wm0.min_ddb_alloc > total[plane_id]) memset(&wm->sagv.wm0, 0, sizeof(wm->sagv.wm0)); - if (wm->sagv.trans_wm.plane_res_b >= total[plane_id]) + if (wm->sagv.trans_wm.min_ddb_alloc > total[plane_id]) memset(&wm->sagv.trans_wm, 0, sizeof(wm->sagv.trans_wm)); } @@ -5404,13 +5404,15 @@ static void skl_compute_transition_wm(struct drm_i915_private *dev_priv, } else { res_blocks = wm0_sel_res_b + trans_offset_b; } + res_blocks++; /* * Just assume we can enable the transition watermark. After * computing the DDB we'll come back and disable it if that * assumption turns out to be false. */ - trans_wm->plane_res_b = res_blocks + 1; + trans_wm->plane_res_b = res_blocks; + trans_wm->min_ddb_alloc = max_t(u16, wm0->min_ddb_alloc, res_blocks + 1); trans_wm->plane_en = true; } |