SAGV support for Gen12+
Subsystems (3)
v24 cover SAGV support for Gen12+
For Gen11+ platforms BSpec suggests disabling specific QGV points separately, depending on bandwidth limitations and current display configuration. Thus it required adding a new PCode request for disabling QGV points and some refactoring of already existing SAGV code.
Also had to refactor intel_can_enable_sagv function, as current seems to be outdated and using skl specific workarounds, also not following BSpec for Gen11+.
Stanislav Lisovskiy (11):
drm/i915: Introduce skl_plane_wm_level accessor. drm/i915: Add intel_atomic_get_bw_*_state helpers drm/i915: Prepare to extract gen specific functions from
intel_can_enable_sagv
drm/i915: Add pre/post plane updates for SAGV drm/i915: Use bw state for per crtc SAGV evaluation drm/i915: Separate icl and skl SAGV checking drm/i915: Add TGL+ SAGV support
drm/i915: Added required new PCode commands
drm/i915: Rename bw_state to new_bw_state
drm/i915: Restrict qgv points which don't have enough bandwidth. drm/i915: Enable SAGV support for Gen12
drivers/gpu/drm/i915/display/intel_bw.c | 187 ++++++-- drivers/gpu/drm/i915/display/intel_bw.h | 24 + drivers/gpu/drm/i915/display/intel_display.c | 21 +- .../drm/i915/display/intel_display_types.h | 6 + drivers/gpu/drm/i915/i915_reg.h | 5 + drivers/gpu/drm/i915/intel_pm.c | 421 ++++++++++++++++-- drivers/gpu/drm/i915/intel_pm.h | 8 +- drivers/gpu/drm/i915/intel_sideband.c | 2 + 8 files changed, 565 insertions(+), 109 deletions(-)
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 1/11 drm/i915: Introduce skl_plane_wm_level accessor.
For future Gen12 SAGV implementation we need to seemlessly alter wm levels calculated, depending on whether we are allowed to enable SAGV or not.
So this accessor will give additional flexibility to do that.
Currently this accessor is still simply working as "pass-through" function. This will be changed in next coming patches from this series.
v2: - plane_id -> plane->id(Ville Syrjälä)
- Moved wm_level var to have more local scope (Ville Syrjälä)
- Renamed yuv to color_plane(Ville Syrjälä) in skl_plane_wm_level
v3: - plane->id -> plane_id(this time for real, Ville Syrjälä)
- Changed colorplane id type from boolean to int as index (Ville Syrjälä)
- Moved crtc_state param so that it is first now (Ville Syrjälä)
- Moved wm_level declaration to tigher scope in skl_write_plane_wm(Ville Syrjälä)
v4: - Started to use enum values for color plane
- Do sizeof for a type what we are memset'ing
- Zero out wm_uv as well(Ville Syrjälä)
v5: - Fixed rebase conflict caused by COLOR_PLANE_*
enum removal
--- drivers/gpu/drm/i915/intel_pm.c | 85 ++++++++++++++++++++++++++------- 1 file changed, 67 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +67 -18
@@ -4547,6 +4547,18 @@ icl_get_total_relative_data_rate(struct intel_crtc_state *crtc_state,return total_data_rate; } +static const struct skl_wm_level * +skl_plane_wm_level (const struct intel_crtc_state *crtc_state, +enum plane_id plane_id, +int level, +int color_plane) +{ +const struct skl_plane_wm *wm = + &crtc_state->wm.skl.optimal.planes[plane_id]; + +return color_plane ==0 ? &wm->wm[level] : &wm->uv_wm[level]; +} +static int skl_allocate_pipe_ddb (struct intel_crtc_state *crtc_state) {
@@ -4606,22 +4618,28 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)*/ for (level =ilk_wm_max_level (dev_priv); level >=0 ; level--) { blocks =0 ; +for_each_plane_id_on_crtc (crtc, plane_id) { -const struct skl_plane_wm *wm = - &crtc_state->wm.skl.optimal.planes[plane_id]; +const struct skl_wm_level *wm_level; +const struct skl_wm_level *wm_uv_level; + + wm_level =skl_plane_wm_level (crtc_state, plane_id, + level,0 ); + wm_uv_level =skl_plane_wm_level (crtc_state, plane_id, + level,1 );if (plane_id ==PLANE_CURSOR ) { -if (wm->wm[level].min_ddb_alloc > total[PLANE_CURSOR ]) { +if (wm_level->min_ddb_alloc > total[PLANE_CURSOR ]) {drm_WARN_ON (&dev_priv->drm, - wm->wm[level].min_ddb_alloc !=U16_MAX ); + wm_level->min_ddb_alloc !=U16_MAX ); blocks =U32_MAX ;break ; }continue ; } - blocks += wm->wm[level].min_ddb_alloc; - blocks += wm->uv_wm[level].min_ddb_alloc; + blocks += wm_level->min_ddb_alloc; + blocks += wm_uv_level->min_ddb_alloc; }if (blocks <= alloc_size) {
@@ -4644,11 +4662,16 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)* proportional to its relative data rate. */ for_each_plane_id_on_crtc (crtc, plane_id) { -const struct skl_plane_wm *wm = - &crtc_state->wm.skl.optimal.planes[plane_id]; +const struct skl_wm_level *wm_level; +const struct skl_wm_level *wm_uv_level;u64 rate;u16 extra; + wm_level =skl_plane_wm_level (crtc_state, plane_id, + level,0 ); + wm_uv_level =skl_plane_wm_level (crtc_state, plane_id, + level,1 ); +if (plane_id ==PLANE_CURSOR )continue ;
@@ -4663,7 +4686,7 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state) extra =min_t (u16, alloc_size,DIV64_U64_ROUND_UP (alloc_size * rate, total_data_rate)); - total[plane_id] = wm->wm[level].min_ddb_alloc + extra; + total[plane_id] = wm_level->min_ddb_alloc + extra; alloc_size -= extra; total_data_rate -= rate;
@@ -4674,7 +4697,7 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state) extra =min_t (u16, alloc_size,DIV64_U64_ROUND_UP (alloc_size * rate, total_data_rate)); - uv_total[plane_id] = wm->uv_wm[level].min_ddb_alloc + extra; + uv_total[plane_id] = wm_uv_level->min_ddb_alloc + extra; alloc_size -= extra; total_data_rate -= rate; }
@@ -4717,9 +4740,16 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)*/ for (level++; level <=ilk_wm_max_level (dev_priv); level++) {for_each_plane_id_on_crtc (crtc, plane_id) { +const struct skl_wm_level *wm_level; +const struct skl_wm_level *wm_uv_level;struct skl_plane_wm *wm = &crtc_state->wm.skl.optimal.planes[plane_id]; + wm_level =skl_plane_wm_level (crtc_state, plane_id, + level,0 ); + wm_uv_level =skl_plane_wm_level (crtc_state, plane_id, + level,1 ); +/* * We only disable the watermarks for each plane if * they exceed the ddb allocation of said plane. This
@@ -4732,9 +4762,13 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)* planes must be enabled before the level will be used." * So this is actually safe to do. */ -if (wm->wm[level].min_ddb_alloc > total[plane_id] || - wm->uv_wm[level].min_ddb_alloc > uv_total[plane_id]) -memset (&wm->wm[level],0 ,sizeof (wm->wm[level])); +if (wm_level->min_ddb_alloc > total[plane_id] || + wm_uv_level->min_ddb_alloc > uv_total[plane_id]) { +memset (&wm->wm[level],0 , +sizeof (wm->wm[level])); +memset (&wm->uv_wm[level],0 , +sizeof (wm->uv_wm[level])); + }/* * Wa_1408961008:icl, ehl
@@ -4742,9 +4776,14 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)*/ if (IS_GEN (dev_priv,11 ) && level ==1 && wm->wm[0 ].plane_en) { - wm->wm[level].plane_res_b = wm->wm[0 ].plane_res_b; - wm->wm[level].plane_res_l = wm->wm[0 ].plane_res_l; - wm->wm[level].ignore_lines = wm->wm[0 ].ignore_lines; + wm_level =skl_plane_wm_level (crtc_state, plane_id, +0 ,0 ); + wm->wm[level].plane_res_b = + wm_level->plane_res_b; + wm->wm[level].plane_res_l = + wm_level->plane_res_l; + wm->wm[level].ignore_lines = + wm_level->ignore_lines; } } }
@@ -5358,8 +5397,13 @@ void skl_write_plane_wm(struct intel_plane *plane, &crtc_state->wm.skl.plane_ddb_uv[plane_id];for (level =0 ; level <= max_level; level++) { +const struct skl_wm_level *wm_level; +int color_plane =0 ; + + wm_level =skl_plane_wm_level (crtc_state, plane_id, level, color_plane); +skl_write_wm_level (dev_priv,PLANE_WM (pipe, plane_id, level), - &wm->wm[level]); + wm_level); }skl_write_wm_level (dev_priv,PLANE_WM_TRANS (pipe, plane_id), &wm->trans_wm);
@@ -5392,8 +5436,13 @@ void skl_write_cursor_wm(struct intel_plane *plane, &crtc_state->wm.skl.plane_ddb_y[plane_id];for (level =0 ; level <= max_level; level++) { +const struct skl_wm_level *wm_level; +int color_plane =0 ; + + wm_level =skl_plane_wm_level (crtc_state, plane_id, level, color_plane); +skl_write_wm_level (dev_priv,CUR_WM (pipe, level), - &wm->wm[level]); + wm_level); }skl_write_wm_level (dev_priv,CUR_WM_TRANS (pipe), &wm->trans_wm);
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 2/11 drm/i915: Add intel_atomic_get_bw_*_state helpers
In reply to Stanislav LisovskiyAdd correspondent helpers to be able to get old/new bandwidth global state object.
v2: - Fixed typo in function call
v3: - Changed new functions naming to use convention proposed
by Jani Nikula, i.e intel_bw_* in intel_bw.c file.
v4: - Change function naming back to intel_atomic* pattern,
was decided to rename in a separate patch series.
v5: - Fix function naming to match existing practices(Ville)
v6: - Removed spurious whitespace
v7: - Removed bw_state NULL checks(Ville)
--- drivers/gpu/drm/i915/display/intel_bw.c | 24 +++++++++++++++++++++++- drivers/gpu/drm/i915/display/intel_bw.h | 9 +++++++++ 2 files changed, 32 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_bw.c +23 -1
@@ -375,7 +375,29 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv,return data_rate; } -static struct intel_bw_state * +struct intel_bw_state * +intel_atomic_get_old_bw_state (struct intel_atomic_state *state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +struct intel_global_state *bw_state; + + bw_state =intel_atomic_get_old_global_obj_state (state, &dev_priv->bw_obj); + +return to_intel_bw_state (bw_state); +} + +struct intel_bw_state * +intel_atomic_get_new_bw_state (struct intel_atomic_state *state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +struct intel_global_state *bw_state; + + bw_state =intel_atomic_get_new_global_obj_state (state, &dev_priv->bw_obj); + +return to_intel_bw_state (bw_state); +} + +struct intel_bw_state *intel_atomic_get_bw_state (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev);
drivers/gpu/drm/i915/display/intel_bw.h +9 -0
@@ -24,6 +24,15 @@ struct intel_bw_state {#define to_intel_bw_state (x) container_of((x), struct intel_bw_state, base) +struct intel_bw_state * +intel_atomic_get_old_bw_state (struct intel_atomic_state *state); + +struct intel_bw_state * +intel_atomic_get_new_bw_state (struct intel_atomic_state *state); + +struct intel_bw_state * +intel_atomic_get_bw_state (struct intel_atomic_state *state); +void intel_bw_init_hw (struct drm_i915_private *dev_priv);int intel_bw_init (struct drm_i915_private *dev_priv);int intel_bw_atomic_check (struct intel_atomic_state *state);
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 3/11 drm/i915: Prepare to extract gen specific functions from intel_can_enable_sagv
In reply to Stanislav LisovskiyAddressing one of the comments, recommending to extract platform specific code from intel_can_enable_sagv as a preparation, before we are going to add support for tgl+.
v2: - Removed whitespace
v3: - Removed premature debug and new cycle introduction(Ville)
- Added missing no active pipes check(Ville)
--- drivers/gpu/drm/i915/intel_pm.c | 64 +++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +38 -26
@@ -3757,42 +3757,23 @@ intel_disable_sagv(struct drm_i915_private *dev_priv)return 0 ; } -bool intel_can_enable_sagv (struct intel_atomic_state *state) +static bool intel_crtc_can_enable_sagv (const struct intel_crtc_state *crtc_state) { -struct drm_device *dev = state->base.dev; +struct drm_device *dev = crtc_state->uapi.crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_plane *plane; -struct intel_crtc_state *crtc_state; -enum pipe pipe; +const struct intel_plane_state *plane_state;int level, latency; -if (!intel_has_sagv (dev_priv)) -return false; - -/* -* If there are no active CRTCs, no additional checks need be performed -*/ -if (hweight8 (state->active_pipes) ==0 ) +if (!crtc_state->hw.active)return true; -/* -* SKL+ workaround: bspec recommends we disable SAGV when we have -* more then one pipe enabled -*/ -if (hweight8 (state->active_pipes) >1 ) -return false; - -/* Since we're now guaranteed to only have one active CRTC... */ - pipe =ffs (state->active_pipes) -1 ; - crtc =intel_get_crtc_for_pipe (dev_priv, pipe); - crtc_state =to_intel_crtc_state (crtc->base.state); -if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE )return false;for_each_intel_plane_on_crtc (dev, crtc, plane) { -struct skl_plane_wm *wm = +const struct skl_plane_wm *wm = &crtc_state->wm.skl.optimal.planes[plane->id];/* Skip this plane if it's not enabled */
@@ -3807,7 +3788,7 @@ bool intel_can_enable_sagv(struct intel_atomic_state *state) latency = dev_priv->wm.skl_latency[level];if (skl_needs_memory_bw_wa (dev_priv) && - plane->base.state->fb->modifier == + plane_state->uapi.fb->modifier ==I915_FORMAT_MOD_X_TILED ) latency +=15 ;
@@ -3823,6 +3804,37 @@ bool intel_can_enable_sagv(struct intel_atomic_state *state)return true; } +bool intel_can_enable_sagv (struct intel_atomic_state *state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +struct intel_crtc *crtc; +const struct intel_crtc_state *crtc_state; +enum pipe pipe; + +if (!intel_has_sagv (dev_priv)) +return false; + +/* +* If there are no active CRTCs, no additional checks need be performed +*/ +if (hweight8 (state->active_pipes) ==0 ) +return true; + +/* +* SKL+ workaround: bspec recommends we disable SAGV when we have +* more then one pipe enabled +*/ +if (hweight8 (state->active_pipes) >1 ) +return false; + +/* Since we're now guaranteed to only have one active CRTC... */ + pipe =ffs (state->active_pipes) -1 ; + crtc =intel_get_crtc_for_pipe (dev_priv, pipe); + crtc_state =to_intel_crtc_state (crtc->base.state); + +return intel_crtc_can_enable_sagv (crtc_state); +} +/* * Calculate initial DBuf slice offset, based on slice size * and mask(i.e if slice size is 1024 and second slice is enabled
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 3/11 drm/i915: Prepare to extract gen specific functions from intel_can_enable_sagv
Addressing one of the comments, recommending to extract platform specific code from intel_can_enable_sagv as a preparation, before we are going to add support for tgl+.
v2: - Removed whitespace
v3: - Removed premature debug and new cycle introduction(Ville)
- Added missing no active pipes check(Ville)
v4: - Fixed stupid mistake with plane_state caused by stupid macro change
--- drivers/gpu/drm/i915/intel_pm.c | 61 +++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +36 -25
@@ -3757,42 +3757,22 @@ intel_disable_sagv(struct drm_i915_private *dev_priv)return 0 ; } -bool intel_can_enable_sagv (struct intel_atomic_state *state) +static bool intel_crtc_can_enable_sagv (const struct intel_crtc_state *crtc_state) { -struct drm_device *dev = state->base.dev; +struct drm_device *dev = crtc_state->uapi.crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_plane *plane; -struct intel_crtc_state *crtc_state; -enum pipe pipe;int level, latency; -if (!intel_has_sagv (dev_priv)) -return false; - -/* -* If there are no active CRTCs, no additional checks need be performed -*/ -if (hweight8 (state->active_pipes) ==0 ) +if (!crtc_state->hw.active)return true; -/* -* SKL+ workaround: bspec recommends we disable SAGV when we have -* more then one pipe enabled -*/ -if (hweight8 (state->active_pipes) >1 ) -return false; - -/* Since we're now guaranteed to only have one active CRTC... */ - pipe =ffs (state->active_pipes) -1 ; - crtc =intel_get_crtc_for_pipe (dev_priv, pipe); - crtc_state =to_intel_crtc_state (crtc->base.state); -if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE )return false;for_each_intel_plane_on_crtc (dev, crtc, plane) { -struct skl_plane_wm *wm = +const struct skl_plane_wm *wm = &crtc_state->wm.skl.optimal.planes[plane->id];/* Skip this plane if it's not enabled */
@@ -3823,6 +3803,37 @@ bool intel_can_enable_sagv(struct intel_atomic_state *state)return true; } +bool intel_can_enable_sagv (struct intel_atomic_state *state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +struct intel_crtc *crtc; +const struct intel_crtc_state *crtc_state; +enum pipe pipe; + +if (!intel_has_sagv (dev_priv)) +return false; + +/* +* If there are no active CRTCs, no additional checks need be performed +*/ +if (hweight8 (state->active_pipes) ==0 ) +return true; + +/* +* SKL+ workaround: bspec recommends we disable SAGV when we have +* more then one pipe enabled +*/ +if (hweight8 (state->active_pipes) >1 ) +return false; + +/* Since we're now guaranteed to only have one active CRTC... */ + pipe =ffs (state->active_pipes) -1 ; + crtc =intel_get_crtc_for_pipe (dev_priv, pipe); + crtc_state =to_intel_crtc_state (crtc->base.state); + +return intel_crtc_can_enable_sagv (crtc_state); +} +/* * Calculate initial DBuf slice offset, based on slice size * and mask(i.e if slice size is 1024 and second slice is enabled
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 4/11 drm/i915: Add pre/post plane updates for SAGV
In reply to Stanislav LisovskiyLets have a unified way to handle SAGV changes, espoecially considering the upcoming Gen12 changes.
Current "standard" way of doing this in commit_tail is pre/post plane updates, when everything which has to be forbidden and not supported in new config has to be restricted before update and relaxed after plane update.
v2: - Removed unneeded returns(Ville)
--- drivers/gpu/drm/i915/display/intel_display.c | 13 ++++--------- drivers/gpu/drm/i915/intel_pm.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_pm.h | 2 ++ 3 files changed, 22 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +4 -9
@@ -15349,12 +15349,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_set_cdclk_pre_plane_update (state); -/* -* SKL workaround: bspec recommends we disable the SAGV when we -* have more then one pipe enabled -*/ -if (!intel_can_enable_sagv (state)) -intel_disable_sagv (dev_priv); +intel_sagv_pre_plane_update (state);intel_modeset_verify_disabled (dev_priv, state); }
@@ -15451,11 +15446,11 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_check_cpu_fifo_underruns (dev_priv);intel_check_pch_fifo_underruns (dev_priv); -if (state->modeset) +if (state->modeset) {intel_verify_planes (state); -if (state->modeset &&intel_can_enable_sagv (state)) -intel_enable_sagv (dev_priv); +intel_sagv_post_plane_update (state); + }drm_atomic_helper_commit_hw_done (&state->base);
drivers/gpu/drm/i915/intel_pm.c +16 -0
@@ -3757,6 +3757,22 @@ intel_disable_sagv(struct drm_i915_private *dev_priv)return 0 ; } +void intel_sagv_pre_plane_update (struct intel_atomic_state *state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); + +if (!intel_can_enable_sagv (state)) +intel_disable_sagv (dev_priv); +} + +void intel_sagv_post_plane_update (struct intel_atomic_state *state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); + +if (intel_can_enable_sagv (state)) +intel_enable_sagv (dev_priv); +} +static bool intel_crtc_can_enable_sagv (const struct intel_crtc_state *crtc_state) {struct drm_device *dev = crtc_state->uapi.crtc->dev;
drivers/gpu/drm/i915/intel_pm.h +2 -0
@@ -44,6 +44,8 @@ void vlv_wm_sanitize(struct drm_i915_private *dev_priv);bool intel_can_enable_sagv (struct intel_atomic_state *state);int intel_enable_sagv (struct drm_i915_private *dev_priv);int intel_disable_sagv (struct drm_i915_private *dev_priv); +void intel_sagv_pre_plane_update (struct intel_atomic_state *state); +void intel_sagv_post_plane_update (struct intel_atomic_state *state);bool skl_wm_level_equals (const struct skl_wm_level *l1,const struct skl_wm_level *l2); bool skl_ddb_allocation_overlaps(const struct skl_ddb_entry *ddb,
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v24 04/11] drm/i915: Add pre/post plane updates for SAGV
Quoted 9 lines · Stanislav Lisovskiy
Lets have a unified way to handle SAGV changes, espoecially considering the upcoming Gen12 changes.
Current "standard" way of doing this in
commit_tailis pre/post plane updates, when everything which has to be forbidden and not supported in new config has to be restricted before update and relaxed after plane update.
Quoted 4 lines
v2: - Removed unneeded returns(Ville)
Reviewed-by Ville Syrjälä <[email protected]>Signed-off-by Stanislav Lisovskiy <[email protected]>
Pushed patches 2,3,4 to dinq. Thanks.
Quoted 81 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 13 ++++--------- drivers/gpu/drm/i915/intel_pm.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_pm.h | 2 ++ 3 files changed, 22 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +4
-9@@ -15349,12 +15349,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_set_cdclk_pre_plane_update (state); -/* -* SKL workaround: bspec recommends we disable the SAGV when we -* have more then one pipe enabled -*/ -if (!intel_can_enable_sagv (state)) -intel_disable_sagv (dev_priv); +intel_sagv_pre_plane_update (state);intel_modeset_verify_disabled (dev_priv, state); }@@ -15451,11 +15446,11 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_check_cpu_fifo_underruns (dev_priv);intel_check_pch_fifo_underruns (dev_priv); -if (state->modeset) +if (state->modeset) {intel_verify_planes (state); -if (state->modeset &&intel_can_enable_sagv (state)) -intel_enable_sagv (dev_priv); +intel_sagv_post_plane_update (state); + }drm_atomic_helper_commit_hw_done (&state->base);drivers/gpu/drm/i915/intel_pm.c +16
-0@@ -3757,6 +3757,22 @@ intel_disable_sagv(struct drm_i915_private *dev_priv)return 0 ; } +void intel_sagv_pre_plane_update (struct intel_atomic_state *state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); + +if (!intel_can_enable_sagv (state)) +intel_disable_sagv (dev_priv); +} + +void intel_sagv_post_plane_update (struct intel_atomic_state *state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); + +if (intel_can_enable_sagv (state)) +intel_enable_sagv (dev_priv); +} +static bool intel_crtc_can_enable_sagv (const struct intel_crtc_state *crtc_state) {struct drm_device *dev = crtc_state->uapi.crtc->dev;drivers/gpu/drm/i915/intel_pm.h +2
-0@@ -44,6 +44,8 @@ void vlv_wm_sanitize(struct drm_i915_private *dev_priv);bool intel_can_enable_sagv (struct intel_atomic_state *state);int intel_enable_sagv (struct drm_i915_private *dev_priv);int intel_disable_sagv (struct drm_i915_private *dev_priv); +void intel_sagv_pre_plane_update (struct intel_atomic_state *state); +void intel_sagv_post_plane_update (struct intel_atomic_state *state);bool skl_wm_level_equals (const struct skl_wm_level *l1,const struct skl_wm_level *l2); bool skl_ddb_allocation_overlaps(const struct skl_ddb_entry *ddb,Signature · 1 line
2.24.1.485.gad05a3d8e5
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 5/11 drm/i915: Use bw state for per crtc SAGV evaluation
In reply to Stanislav LisovskiyFuture platforms require per-crtc SAGV evaluation and serializing global state when those are changed from different commits.
v2: - Add has_sagv check to intel_crtc_can_enable_sagv
so that it sets bit in reject mask.
- Use bw_state in intel_pre/post_plane_enable_sagv instead of atomic state
v3: - Fixed rebase conflict, now using
intel_atomic_crtc_state_for_each_plane_state in order to call it from atomic check
--- drivers/gpu/drm/i915/display/intel_bw.h | 6 ++ drivers/gpu/drm/i915/intel_pm.c | 115 ++++++++++++++++++------ drivers/gpu/drm/i915/intel_pm.h | 4 +- 3 files changed, 95 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.h +6 -0
@@ -18,6 +18,12 @@ struct intel_crtc_state;struct intel_bw_state {struct intel_global_state base; +/* +* Contains a bit mask, used to determine, whether correspondent +* pipe allows SAGV or not. +*/ +u8 pipe_sagv_reject; +unsigned int data_rate[I915_MAX_PIPES ];u8 num_active_planes[I915_MAX_PIPES ]; };
drivers/gpu/drm/i915/intel_pm.c +86 -29
175 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.h +3 -1
@@ -9,6 +9,7 @@#include <linux/types.h> #include "i915_reg.h" +#include "display/intel_bw.h" struct drm_device ;struct drm_i915_private ;
@@ -41,7 +42,8 @@ void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, struct skl_pipe_wm *out);void g4x_wm_sanitize (struct drm_i915_private *dev_priv);void vlv_wm_sanitize (struct drm_i915_private *dev_priv); -bool intel_can_enable_sagv (struct intel_atomic_state *state); +bool intel_has_sagv (struct drm_i915_private *dev_priv); +bool intel_can_enable_sagv (const struct intel_bw_state *bw_state);int intel_enable_sagv (struct drm_i915_private *dev_priv);int intel_disable_sagv (struct drm_i915_private *dev_priv);void intel_sagv_pre_plane_update (struct intel_atomic_state *state);
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 5/11 drm/i915: Use bw state for per crtc SAGV evaluation
Future platforms require per-crtc SAGV evaluation and serializing global state when those are changed from different commits.
v2: - Add has_sagv check to intel_crtc_can_enable_sagv
so that it sets bit in reject mask.
- Use bw_state in intel_pre/post_plane_enable_sagv instead of atomic state
v3: - Fixed rebase conflict, now using
intel_atomic_crtc_state_for_each_plane_state in order to call it from atomic check
v4: - Use fb modifier from plane state
--- drivers/gpu/drm/i915/display/intel_bw.h | 6 ++ drivers/gpu/drm/i915/intel_pm.c | 118 ++++++++++++++++++------ drivers/gpu/drm/i915/intel_pm.h | 4 +- 3 files changed, 97 insertions(+), 31 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.h +6 -0
@@ -18,6 +18,12 @@ struct intel_crtc_state;struct intel_bw_state {struct intel_global_state base; +/* +* Contains a bit mask, used to determine, whether correspondent +* pipe allows SAGV or not. +*/ +u8 pipe_sagv_reject; +unsigned int data_rate[I915_MAX_PIPES ];u8 num_active_planes[I915_MAX_PIPES ]; };
drivers/gpu/drm/i915/intel_pm.c +88 -30
183 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.h +3 -1
@@ -9,6 +9,7 @@#include <linux/types.h> #include "i915_reg.h" +#include "display/intel_bw.h" struct drm_device ;struct drm_i915_private ;
@@ -41,7 +42,8 @@ void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, struct skl_pipe_wm *out);void g4x_wm_sanitize (struct drm_i915_private *dev_priv);void vlv_wm_sanitize (struct drm_i915_private *dev_priv); -bool intel_can_enable_sagv (struct intel_atomic_state *state); +bool intel_has_sagv (struct drm_i915_private *dev_priv); +bool intel_can_enable_sagv (const struct intel_bw_state *bw_state);int intel_enable_sagv (struct drm_i915_private *dev_priv);int intel_disable_sagv (struct drm_i915_private *dev_priv);void intel_sagv_pre_plane_update (struct intel_atomic_state *state);
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v24 05/11] drm/i915: Use bw state for per crtc SAGV evaluation
Quoted 53 lines · Stanislav Lisovskiy
Future platforms require per-crtc SAGV evaluation and serializing global state when those are changed from different commits.
v2: - Add
has_sagvcheck tointel_crtc_can_enable_sagv
so that it sets bit in reject mask.
- Usebw_statein intel_pre/post_plane_enable_sagv instead of atomic statev3: - Fixed rebase conflict, now using
intel_atomic_crtc_state_for_each_plane_statein order to call it from atomic check
v4: - Use fb modifier from plane stateSigned-off-by Stanislav Lisovskiy <[email protected]>Cc Ville Syrjälä <[email protected]>Cc James Ausmus <[email protected]>--- drivers/gpu/drm/i915/display/intel_bw.h | 6 ++ drivers/gpu/drm/i915/intel_pm.c | 118 ++++++++++++++++++------ drivers/gpu/drm/i915/intel_pm.h | 4 +- 3 files changed, 97 insertions(+), 31 deletions(-)drivers/gpu/drm/i915/display/intel_bw.h +6
-0@@ -18,6 +18,12 @@ struct intel_crtc_state;struct intel_bw_state {struct intel_global_state base; +/* +* Contains a bit mask, used to determine, whether correspondent +* pipe allows SAGV or not. +*/ +u8 pipe_sagv_reject; +unsigned int data_rate[I915_MAX_PIPES ];u8 num_active_planes[I915_MAX_PIPES ]; };drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -43,6 +43,7 @@#include "i915_fixed.h" #include "i915_irq.h" #include "i915_trace.h" +#include "display/intel_bw.h" #include "intel_pm.h" #include "intel_sideband.h" #include "../../../platform/x86/intel_ips.h"
drivers/gpu/drm/i915/intel_pm.c static bool skl_needs_memory_bw_wa(struct drm_i915_private *dev_priv) · line 3638
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -3634,7 +3635,7 @@ static bool skl_needs_memory_bw_wa(struct drm_i915_private *dev_priv)return IS_GEN9_BC (dev_priv) ||IS_BROXTON (dev_priv); } -static bool +bool
Can't see where that's needed.
drivers/gpu/drm/i915/intel_pm.c intel_disable_sagv(struct drm_i915_private *dev_priv) · line 3764
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +1
-0intel_has_sagv(struct drm_i915_private *dev_priv) {/* HACK! */ @@ -3760,34 +3761,78 @@ intel_disable_sagv(struct drm_i915_private *dev_priv)void intel_sagv_pre_plane_update (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +const struct intel_bw_state *new_bw_state =NULL ;
Pointless =NULL
drivers/gpu/drm/i915/intel_pm.c intel_disable_sagv(struct drm_i915_private *dev_priv) · line 3774
Quoted 11 lines
drivers/gpu/drm/i915/intel_pm.c +9
-1-if (!intel_can_enable_sagv (state)) +/* +* Just return if we can't control SAGV or don't have it. +* This is different from situation when we have SAGV but just can't +* afford it due to DBuf limitation - in case if SAGV is completely +* disabled in a BIOS, we are not even allowed to send a PCode request, +* as it will throw an error. So have to check it here. +*/ +if (!intel_has_sagv (dev_priv)) +return ;
Feels a bit wrong to have this here. I'm thinking if we change the check further down to be something like:
if (can_sagv(old_bw_state) && !can_sagv(new_bw_state))
disable_sagv();
(+ the similar for the enable) then we wouldn't need this extra has_sagv() check at all I believe. In fact that would also avoid poking the pcode when nothing changes. Now we seem to poke it every time?
Anyways since it looks like we're already poking the pcode a bit too much I guess it's fine for now. Could do this stuff as a followup.
drivers/gpu/drm/i915/intel_pm.c intel_disable_sagv(struct drm_i915_private *dev_priv) · line 3787
Quoted 13 lines
drivers/gpu/drm/i915/intel_pm.c +7
-0+ + new_bw_state =intel_atomic_get_new_bw_state (state); +if (!new_bw_state) +return ; + +if (!intel_can_enable_sagv (new_bw_state))intel_disable_sagv (dev_priv); }void intel_sagv_post_plane_update (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +const struct intel_bw_state *new_bw_state =NULL ;
Pointless =NULL
Quoted 16 lines
drivers/gpu/drm/i915/intel_pm.c +14
-1-if (intel_can_enable_sagv (state)) +/* +* Just return if we can't control SAGV or don't have it. +* This is different from situation when we have SAGV but just can't +* afford it due to DBuf limitation - in case if SAGV is completely +* disabled in a BIOS, we are not even allowed to send a PCode request, +* as it will throw an error. So have to check it here. +*/ +if (!intel_has_sagv (dev_priv)) +return ; + + new_bw_state =intel_atomic_get_new_bw_state (state); +if (!new_bw_state) +return ; +
drivers/gpu/drm/i915/intel_pm.c intel_disable_sagv(struct drm_i915_private *dev_priv) · line 3810
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +3
-2+if (intel_can_enable_sagv (new_bw_state))intel_enable_sagv (dev_priv); }static bool intel_crtc_can_enable_sagv (const struct intel_crtc_state *crtc_state) { -struct drm_device *dev = crtc_state->uapi.crtc->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_atomic_state *state =to_intel_atomic_state (crtc_state->uapi.state); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);
I'd use either state->base.dev or crtc->base.dev here to make it a bit shorter.
Quoted 13 lines
drivers/gpu/drm/i915/intel_pm.c +5
-1struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_plane *plane; +const struct intel_plane_state *plane_state;int level, latency; +if (!intel_has_sagv (dev_priv)) +return false; +if (!crtc_state->hw.active)return true; -if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) +/*
drivers/gpu/drm/i915/intel_pm.c intel_disable_sagv(struct drm_i915_private *dev_priv) · line 3831
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +7
-1+* SKL+ workaround: bspec recommends we disable SAGV when we have +* more then one pipe enabled +*/ +if (hweight8 (state->active_pipes) >1 )return false; -for_each_intel_plane_on_crtc (dev, crtc, plane) { +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) { +DRM_DEBUG_KMS ("No SAGV for interlaced mode on pipe %c\n" , +pipe_name (crtc->pipe));
Why does this deserve a special debug when the other paths don't? I'd just drop this.
Quoted 60 lines
drivers/gpu/drm/i915/intel_pm.c +23
-18+return false; + } + +intel_atomic_crtc_state_for_each_plane_state (plane, plane_state, crtc_state) {const struct skl_plane_wm *wm = &crtc_state->wm.skl.optimal.planes[plane->id];@@ -3803,7 +3848,7 @@ static bool intel_crtc_can_enable_sagv(const struct intel_crtc_state *crtc_state latency = dev_priv->wm.skl_latency[level];if (skl_needs_memory_bw_wa (dev_priv) && - plane->base.state->fb->modifier == + plane_state->uapi.fb->modifier ==I915_FORMAT_MOD_X_TILED ) latency +=15 ;@@ -3819,35 +3864,44 @@ static bool intel_crtc_can_enable_sagv(const struct intel_crtc_state *crtc_statereturn true; } -bool intel_can_enable_sagv (struct intel_atomic_state *state) +bool intel_can_enable_sagv (const struct intel_bw_state *bw_state) { -struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +return bw_state->pipe_sagv_reject ==0 ; +} + +static int intel_compute_sagv_mask (struct intel_atomic_state *state) +{ +int ret;struct intel_crtc *crtc; -const struct intel_crtc_state *crtc_state; -enum pipe pipe; +struct intel_crtc_state *new_crtc_state; +struct intel_bw_state *new_bw_state =NULL ; +const struct intel_bw_state *old_bw_state =NULL ; +int i; -if (!intel_has_sagv (dev_priv)) -return false; +for_each_new_intel_crtc_in_state (state, crtc, + new_crtc_state, i) { + new_bw_state =intel_atomic_get_bw_state (state); +if (IS_ERR (new_bw_state)) +return PTR_ERR (new_bw_state); -/* -* If there are no active CRTCs, no additional checks need be performed -*/ -if (hweight8 (state->active_pipes) ==0 ) -return true; + old_bw_state =intel_atomic_get_old_bw_state (state); -/* -* SKL+ workaround: bspec recommends we disable SAGV when we have -* more then one pipe enabled -*/ -if (hweight8 (state->active_pipes) >1 ) -return false; +if (intel_crtc_can_enable_sagv (new_crtc_state))
drivers/gpu/drm/i915/intel_pm.c static bool intel_crtc_can_enable_sagv(const struct intel_crtc_state *crtc_state · line 3895
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +5
-4+ new_bw_state->pipe_sagv_reject &= ~BIT (crtc->pipe); + else + new_bw_state->pipe_sagv_reject |= BIT(crtc->pipe); + } -/* Since we're now guaranteed to only have one active CRTC... */ - pipe =ffs (state->active_pipes) -1 ; - crtc =intel_get_crtc_for_pipe (dev_priv, pipe); - crtc_state =to_intel_crtc_state (crtc->base.state); +if (!old_bw_state)
nit: I'd probably check for !new_bw_state since it's the one we operate on.
drivers/gpu/drm/i915/intel_pm.c static bool intel_crtc_can_enable_sagv(const struct intel_crtc_state *crtc_state · line 3899
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +3
-1+return 0 ; -return intel_crtc_can_enable_sagv (crtc_state); +if (new_bw_state->pipe_sagv_reject != old_bw_state->pipe_sagv_reject) { + ret =intel_atomic_serialize_global_state (&new_bw_state->base);
We should only need to serialize if can_sagv(old) != new_sagv(old), otherwise if old_mask!=new_mask then just grabbing the write lock should be sufficient.
This is looking pretty good overall. The one problem I still see is that we only do the sagv_enable/disable when state->modeset==true. Looks like a pre-existing issue with the current code though.
Hmm. You did keep the single pipe restriction in intel_crtc_can_enable_sagv(), but I don't think state->active_pipes will be populated correctly for non-modesets.
I guess what we could do as a start is only do intel_compute_sagv_mask() when state->modeset==true. That is clearly wrong, but looks like it's how the current code works atm. So in theory shouldn't break anything that's not already broken.
The proper fix (which can be a separate patch it seems) I think would be to track the active_pipes bitmask in bw_state (like we do for cdclk_state) + pull the sagv stuff from under state->modeset. I think we need to do that before we continue onto icl/tgl since otherwise we can't trust the sagv mask when doing the qgv mask decisions.
Quoted 43 lines
drivers/gpu/drm/i915/intel_pm.c +9
-0+if (ret) +return ret; + } + +return 0 ; }/* @@ -5860,6 +5914,10 @@ skl_compute_wm(struct intel_atomic_state *state)if (ret)return ret; + ret =intel_compute_sagv_mask (state); +if (ret) +return ret; +/* * skl_compute_ddb() will have adjusted the final watermarks * based on how much ddb is available. Now we can actually drivers/gpu/drm/i915/intel_pm.h +3
-1@@ -9,6 +9,7 @@#include <linux/types.h> #include "i915_reg.h" +#include "display/intel_bw.h" struct drm_device ;struct drm_i915_private ;@@ -41,7 +42,8 @@ void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, struct skl_pipe_wm *out);void g4x_wm_sanitize (struct drm_i915_private *dev_priv);void vlv_wm_sanitize (struct drm_i915_private *dev_priv); -bool intel_can_enable_sagv (struct intel_atomic_state *state); +bool intel_has_sagv (struct drm_i915_private *dev_priv); +bool intel_can_enable_sagv (const struct intel_bw_state *bw_state);int intel_enable_sagv (struct drm_i915_private *dev_priv);int intel_disable_sagv (struct drm_i915_private *dev_priv);void intel_sagv_pre_plane_update (struct intel_atomic_state *state);Signature · 1 line
2.24.1.485.gad05a3d8e5
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v25 5/11 drm/i915: Use bw state for per crtc SAGV evaluation
In reply to Stanislav LisovskiyFuture platforms require per-crtc SAGV evaluation and serializing global state when those are changed from different commits.
v2: - Add has_sagv check to intel_crtc_can_enable_sagv
so that it sets bit in reject mask.
- Use bw_state in intel_pre/post_plane_enable_sagv instead of atomic state
v3: - Fixed rebase conflict, now using
intel_atomic_crtc_state_for_each_plane_state in order to call it from atomic check
v4: - Use fb modifier from plane state
v5: - Make intel_has_sagv static again(Ville)
- Removed unnecessary NULL assignments(Ville)
- Removed unnecessary SAGV debug(Ville)
- Call intel_compute_sagv_mask only for modesets(Ville)
- Serialize global state only if sagv results change, but not mask itself(Ville)
--- drivers/gpu/drm/i915/display/intel_bw.h | 6 ++ drivers/gpu/drm/i915/intel_pm.c | 113 ++++++++++++++++++------ drivers/gpu/drm/i915/intel_pm.h | 3 +- 3 files changed, 93 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.h +6 -0
@@ -18,6 +18,12 @@ struct intel_crtc_state;struct intel_bw_state {struct intel_global_state base; +/* +* Contains a bit mask, used to determine, whether correspondent +* pipe allows SAGV or not. +*/ +u8 pipe_sagv_reject; +unsigned int data_rate[I915_MAX_PIPES ];u8 num_active_planes[I915_MAX_PIPES ]; };
drivers/gpu/drm/i915/intel_pm.c +85 -28
173 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.h +2 -1
@@ -9,6 +9,7 @@#include <linux/types.h> #include "i915_reg.h" +#include "display/intel_bw.h" struct drm_device ;struct drm_i915_private ;
@@ -41,7 +42,7 @@ void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, struct skl_pipe_wm *out);void g4x_wm_sanitize (struct drm_i915_private *dev_priv);void vlv_wm_sanitize (struct drm_i915_private *dev_priv); -bool intel_can_enable_sagv (struct intel_atomic_state *state); +bool intel_can_enable_sagv (const struct intel_bw_state *bw_state);int intel_enable_sagv (struct drm_i915_private *dev_priv);int intel_disable_sagv (struct drm_i915_private *dev_priv);void intel_sagv_pre_plane_update (struct intel_atomic_state *state);
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 6/11 drm/i915: Separate icl and skl SAGV checking
In reply to Stanislav LisovskiyIntroduce platform dependent SAGV checking in
combination with bandwidth state pipe SAGV mask.
v2, v3: Fix rebase conflict
--- drivers/gpu/drm/i915/intel_pm.c | 38 ++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +28 -10
@@ -3806,7 +3806,6 @@ void intel_sagv_post_plane_update(struct intel_atomic_state *state)static bool intel_crtc_can_enable_sagv (const struct intel_crtc_state *crtc_state) { -struct intel_atomic_state *state =to_intel_atomic_state (crtc_state->uapi.state);struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_plane *plane;
@@ -3819,13 +3818,6 @@ static bool intel_crtc_can_enable_sagv(const struct intel_crtc_state *crtc_stateif (!crtc_state->hw.active)return true; -/* -* SKL+ workaround: bspec recommends we disable SAGV when we have -* more then one pipe enabled -*/ -if (hweight8 (state->active_pipes) >1 ) -return false; -if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) {DRM_DEBUG_KMS ("No SAGV for interlaced mode on pipe %c\n" ,pipe_name (crtc->pipe));
@@ -3864,6 +3856,24 @@ static bool intel_crtc_can_enable_sagv(const struct intel_crtc_state *crtc_statereturn true; } +static bool skl_crtc_can_enable_sagv (const struct intel_crtc_state *crtc_state) +{ +struct intel_atomic_state *state =to_intel_atomic_state (crtc_state->uapi.state); +/* +* SKL+ workaround: bspec recommends we disable SAGV when we have +* more then one pipe enabled +*/ +if (hweight8 (state->active_pipes) >1 ) +return false; + +return intel_crtc_can_enable_sagv (crtc_state); +} + +static bool icl_crtc_can_enable_sagv (const struct intel_crtc_state *crtc_state) +{ +return intel_crtc_can_enable_sagv (crtc_state); +} +bool intel_can_enable_sagv (const struct intel_bw_state *bw_state) {return bw_state->pipe_sagv_reject ==0 ;
@@ -3871,22 +3881,30 @@ bool intel_can_enable_sagv(const struct intel_bw_state *bw_state)static int intel_compute_sagv_mask (struct intel_atomic_state *state) { +struct drm_i915_private *dev_priv =to_i915 (state->base.dev);int ret;struct intel_crtc *crtc; -struct intel_crtc_state *new_crtc_state; +const struct intel_crtc_state *new_crtc_state;struct intel_bw_state *new_bw_state =NULL ;const struct intel_bw_state *old_bw_state =NULL ;int i;for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) { +bool can_sagv; + new_bw_state =intel_atomic_get_bw_state (state);if (IS_ERR (new_bw_state))return PTR_ERR (new_bw_state); old_bw_state =intel_atomic_get_old_bw_state (state); -if (intel_crtc_can_enable_sagv (new_crtc_state)) +if (INTEL_GEN (dev_priv) >=11 ) + can_sagv =icl_crtc_can_enable_sagv (new_crtc_state); +else + can_sagv =skl_crtc_can_enable_sagv (new_crtc_state); + +if (can_sagv) new_bw_state->pipe_sagv_reject &= ~BIT (crtc->pipe);else new_bw_state->pipe_sagv_reject |=BIT (crtc->pipe);
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v25 6/11 drm/i915: Separate icl and skl SAGV checking
Introduce platform dependent SAGV checking in
combination with bandwidth state pipe SAGV mask.
v2, v3, v4: Fix rebase conflict
--- drivers/gpu/drm/i915/intel_pm.c | 38 ++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +28 -10
@@ -3806,7 +3806,6 @@ void intel_sagv_post_plane_update(struct intel_atomic_state *state)static bool intel_crtc_can_enable_sagv (const struct intel_crtc_state *crtc_state) { -struct intel_atomic_state *state =to_intel_atomic_state (crtc_state->uapi.state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_plane *plane;
@@ -3819,13 +3818,6 @@ static bool intel_crtc_can_enable_sagv(const struct intel_crtc_state *crtc_stateif (!crtc_state->hw.active)return true; -/* -* SKL+ workaround: bspec recommends we disable SAGV when we have -* more then one pipe enabled -*/ -if (hweight8 (state->active_pipes) >1 ) -return false; -if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE )return false;
@@ -3861,6 +3853,24 @@ static bool intel_crtc_can_enable_sagv(const struct intel_crtc_state *crtc_statereturn true; } +static bool skl_crtc_can_enable_sagv (const struct intel_crtc_state *crtc_state) +{ +struct intel_atomic_state *state =to_intel_atomic_state (crtc_state->uapi.state); +/* +* SKL+ workaround: bspec recommends we disable SAGV when we have +* more then one pipe enabled +*/ +if (hweight8 (state->active_pipes) >1 ) +return false; + +return intel_crtc_can_enable_sagv (crtc_state); +} + +static bool icl_crtc_can_enable_sagv (const struct intel_crtc_state *crtc_state) +{ +return intel_crtc_can_enable_sagv (crtc_state); +} +bool intel_can_enable_sagv (const struct intel_bw_state *bw_state) {return bw_state->pipe_sagv_reject ==0 ;
@@ -3868,22 +3878,30 @@ bool intel_can_enable_sagv(const struct intel_bw_state *bw_state)static int intel_compute_sagv_mask (struct intel_atomic_state *state) { +struct drm_i915_private *dev_priv =to_i915 (state->base.dev);int ret;struct intel_crtc *crtc; -struct intel_crtc_state *new_crtc_state; +const struct intel_crtc_state *new_crtc_state;struct intel_bw_state *new_bw_state =NULL ;const struct intel_bw_state *old_bw_state =NULL ;int i;for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) { +bool can_sagv; + new_bw_state =intel_atomic_get_bw_state (state);if (IS_ERR (new_bw_state))return PTR_ERR (new_bw_state); old_bw_state =intel_atomic_get_old_bw_state (state); -if (intel_crtc_can_enable_sagv (new_crtc_state)) +if (INTEL_GEN (dev_priv) >=11 ) + can_sagv =icl_crtc_can_enable_sagv (new_crtc_state); +else + can_sagv =skl_crtc_can_enable_sagv (new_crtc_state); + +if (can_sagv) new_bw_state->pipe_sagv_reject &= ~BIT (crtc->pipe);else new_bw_state->pipe_sagv_reject |=BIT (crtc->pipe);
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 7/11 drm/i915: Add TGL+ SAGV support
In reply to Stanislav LisovskiyStarting from TGL we need to have a separate wm0 values for SAGV and non-SAGV which affects how calculations are done.
v2: Remove long lines
v3: Removed COLOR_PLANE enum references
--- drivers/gpu/drm/i915/display/intel_display.c | 8 +- .../drm/i915/display/intel_display_types.h | 3 + drivers/gpu/drm/i915/intel_pm.c | 128 +++++++++++++++++- 3 files changed, 130 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +6 -2
@@ -13932,7 +13932,9 @@ static void verify_wm_state(struct intel_crtc *crtc,/* Watermarks */ for (level =0 ; level <= max_level; level++) {if (skl_wm_level_equals (&hw_plane_wm->wm[level], - &sw_plane_wm->wm[level])) + &sw_plane_wm->wm[level]) || + (level ==0 &&skl_wm_level_equals (&hw_plane_wm->wm[level], + &sw_plane_wm->sagv_wm0)))continue ; drm_err(&dev_priv->drm,
@@ -13987,7 +13989,9 @@ static void verify_wm_state(struct intel_crtc *crtc,/* Watermarks */ for (level =0 ; level <= max_level; level++) {if (skl_wm_level_equals (&hw_plane_wm->wm[level], - &sw_plane_wm->wm[level])) + &sw_plane_wm->wm[level]) || + (level ==0 &&skl_wm_level_equals (&hw_plane_wm->wm[level], + &sw_plane_wm->sagv_wm0)))continue ; drm_err(&dev_priv->drm,
drivers/gpu/drm/i915/display/intel_display_types.h +3 -0
@@ -688,11 +688,14 @@ struct skl_plane_wm {struct skl_wm_level wm[8 ];struct skl_wm_level uv_wm[8 ];struct skl_wm_level trans_wm; +struct skl_wm_level sagv_wm0; +struct skl_wm_level uv_sagv_wm0;bool is_planar; };struct skl_pipe_wm {struct skl_plane_wm planes[I915_MAX_PLANES ]; +bool can_sagv; };enum vlv_wm_level {
drivers/gpu/drm/i915/intel_pm.c +121 -7
213 lines not on this page · raw message
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v25 7/11 drm/i915: Add TGL+ SAGV support
Starting from TGL we need to have a separate wm0 values for SAGV and non-SAGV which affects how calculations are done.
v2: Remove long lines
v3: Removed COLOR_PLANE enum references
v4: Fixed rebase conflict
--- drivers/gpu/drm/i915/display/intel_display.c | 8 +- .../drm/i915/display/intel_display_types.h | 3 + drivers/gpu/drm/i915/intel_pm.c | 128 +++++++++++++++++- 3 files changed, 130 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +6 -2
@@ -13932,7 +13932,9 @@ static void verify_wm_state(struct intel_crtc *crtc,/* Watermarks */ for (level =0 ; level <= max_level; level++) {if (skl_wm_level_equals (&hw_plane_wm->wm[level], - &sw_plane_wm->wm[level])) + &sw_plane_wm->wm[level]) || + (level ==0 &&skl_wm_level_equals (&hw_plane_wm->wm[level], + &sw_plane_wm->sagv_wm0)))continue ; drm_err(&dev_priv->drm,
@@ -13987,7 +13989,9 @@ static void verify_wm_state(struct intel_crtc *crtc,/* Watermarks */ for (level =0 ; level <= max_level; level++) {if (skl_wm_level_equals (&hw_plane_wm->wm[level], - &sw_plane_wm->wm[level])) + &sw_plane_wm->wm[level]) || + (level ==0 &&skl_wm_level_equals (&hw_plane_wm->wm[level], + &sw_plane_wm->sagv_wm0)))continue ; drm_err(&dev_priv->drm,
drivers/gpu/drm/i915/display/intel_display_types.h +3 -0
@@ -688,11 +688,14 @@ struct skl_plane_wm {struct skl_wm_level wm[8 ];struct skl_wm_level uv_wm[8 ];struct skl_wm_level trans_wm; +struct skl_wm_level sagv_wm0; +struct skl_wm_level uv_sagv_wm0;bool is_planar; };struct skl_pipe_wm {struct skl_plane_wm planes[I915_MAX_PLANES ]; +bool can_sagv; };enum vlv_wm_level {
drivers/gpu/drm/i915/intel_pm.c +121 -7
213 lines not on this page · raw message
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 8/11 drm/i915: Added required new PCode commands
In reply to Stanislav LisovskiyWe need a new PCode request commands and reply codes to be added as a prepartion patch for QGV points restricting for new SAGV support.
v2: - Extracted those changes into separate patch
(Ville Syrjälä)
v3: - Moved new PCode masks to another place from
PCode commands(Ville)
--- drivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_sideband.c | 2 ++ 2 files changed, 7 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -9085,6 +9085,7 @@ enum {#define GEN7_PCODE_ILLEGAL_DATA 0x3#define GEN11_PCODE_ILLEGAL_SUBCOMMAND 0x4#define GEN11_PCODE_LOCKED 0x6 +#define GEN11_PCODE_REJECTED 0x11#define GEN7_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE 0x10#define GEN6_PCODE_WRITE_RC6VIDS 0x4#define GEN6_PCODE_READ_RC6VIDS 0x5
@@ -9106,6 +9107,7 @@ enum {#define ICL_PCODE_MEM_SUBSYSYSTEM_INFO 0xd#define ICL_PCODE_MEM_SS_READ_GLOBAL_INFO (0x0 << 8)#define ICL_PCODE_MEM_SS_READ_QGV_POINT_INFO (point) (((point) << 16) | (0x1 << 8)) +#define ICL_PCODE_SAGV_DE_MEM_SS_CONFIG 0xe#define GEN6_PCODE_READ_D_COMP 0x10#define GEN6_PCODE_WRITE_D_COMP 0x11#define HSW_PCODE_DE_WRITE_FREQ_REQ 0x17
@@ -9134,6 +9136,9 @@ enum {#define GEN8_GT_SLICE_INFO _MMIO(0x138064)#define GEN8_LSLICESTAT_MASK 0x7 +#define GEN11_PCODE_POINTS_RESTRICTED 0x0 +#define GEN11_PCODE_POINTS_RESTRICTED_MASK 0x1 +#define CHV_POWER_SS0_SIG1 _MMIO(0xa720)#define CHV_POWER_SS1_SIG1 _MMIO(0xa728)#define CHV_SS_PG_ENABLE (1 << 1)
drivers/gpu/drm/i915/intel_sideband.c +2 -0
@@ -371,6 +371,8 @@ static inline int gen7_check_mailbox_status(u32 mbox)return -ENXIO ;case GEN11_PCODE_LOCKED :return -EBUSY ; +case GEN11_PCODE_REJECTED : +return -EACCES ;case GEN7_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE :return -EOVERFLOW ;default :
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 9/11 drm/i915: Rename bw_state to new_bw_state
In reply to Stanislav LisovskiyThat is a preparation patch before next one where we introduce old_bw_state and a bunch of other changes as well.
In a review comment it was suggested to split out at least that renaming into a separate patch, what is done here.
v2: Removed spurious space
--- drivers/gpu/drm/i915/display/intel_bw.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.c +12 -12
@@ -414,7 +414,7 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_crtc_state *new_crtc_state, *old_crtc_state; -struct intel_bw_state *bw_state =NULL ; +struct intel_bw_state *new_bw_state =NULL ;unsigned int data_rate, max_data_rate;unsigned int num_active_planes;struct intel_crtc *crtc;
@@ -443,29 +443,29 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) old_active_planes == new_active_planes)continue ; - bw_state =intel_atomic_get_bw_state (state); -if (IS_ERR (bw_state)) -return PTR_ERR (bw_state); + new_bw_state =intel_atomic_get_bw_state (state); +if (IS_ERR (new_bw_state)) +return PTR_ERR (new_bw_state); - bw_state->data_rate[crtc->pipe] = new_data_rate; - bw_state->num_active_planes[crtc->pipe] = new_active_planes; + new_bw_state->data_rate[crtc->pipe] = new_data_rate; + new_bw_state->num_active_planes[crtc->pipe] = new_active_planes;drm_dbg_kms (&dev_priv->drm,"pipe %c data rate %u num active planes %u\n" ,pipe_name (crtc->pipe), - bw_state->data_rate[crtc->pipe], - bw_state->num_active_planes[crtc->pipe]); + new_bw_state->data_rate[crtc->pipe], + new_bw_state->num_active_planes[crtc->pipe]); } -if (!bw_state) +if (!new_bw_state)return 0 ; - ret =intel_atomic_lock_global_state (&bw_state->base); + ret =intel_atomic_lock_global_state (&new_bw_state->base);if (ret)return ret; - data_rate =intel_bw_data_rate (dev_priv, bw_state); - num_active_planes =intel_bw_num_active_planes (dev_priv, bw_state); + data_rate =intel_bw_data_rate (dev_priv, new_bw_state); + num_active_planes =intel_bw_num_active_planes (dev_priv, new_bw_state); max_data_rate =intel_max_data_rate (dev_priv, num_active_planes);
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 10/11 drm/i915: Restrict qgv points which don't have enough bandwidth.
In reply to Stanislav LisovskiyAccording to BSpec 53998, we should try to restrict qgv points, which can't provide enough bandwidth for desired display configuration.
Currently we are just comparing against all of
those and take minimum(worst case).
v2: Fixed wrong PCode reply mask, removed hardcoded
values.
v3: Forbid simultaneous legacy SAGV PCode requests and
restricting qgv points. Put the actual restriction to commit function, added serialization(thanks to Ville) to prevent commit being applied out of order in case of nonblocking and/or nomodeset commits.
v4:
- Minor code refactoring, fixed few typos(thanks to James Ausmus)
- Change the naming of qgv point
masking/unmasking functions(James Ausmus).
- Simplify the masking/unmasking operation itself,
as we don't need to mask only single point per request(James Ausmus)
- Reject and stick to highest bandwidth point if SAGV can't be enabled(BSpec)
v5:
- Add new mailbox reply codes, which seems to happen during boot time for TGL and indicate that QGV setting is not yet available.
v6:
- Increase number of supported QGV points to be in sync with BSpec.
v7: - Rebased and resolved conflict to fix build failure.
- Fix NUM_QGV_POINTS to 8 and moved that to header file(James Ausmus)
v8: - Don't report an error if we can't restrict qgv points, as SAGV
can be disabled by BIOS, which is completely legal. So don't make CI panic. Instead if we detect that there is only 1 QGV point accessible just analyze if we can fit the required bandwidth requirements, but no need in restricting.
v9: - Fix wrong QGV transition if we have 0 planes and no SAGV
simultaneously.
v10: - Fix CDCLK corruption, because of global state getting serialized
without modeset, which caused copying of non-calculated cdclk to be copied to dev_priv(thanks to Ville for the hint).
v11: - Remove unneeded headers and spaces(Matthew Roper)
- Remove unneeded intel_qgv_info qi struct from bw check and zero out the needed one(Matthew Roper)
- Changed QGV error message to have more clear meaning(Matthew Roper)
- Use state->modeset_set instead of any_ms(Matthew Roper)
- Moved NUM_SAGV_POINTS from i915_reg.h to i915_drv.h where it's used
- Keep using crtc_state->hw.active instead of .enable(Matthew Roper)
- Moved unrelated changes to other patch(using latency as parameter for plane wm calculation, moved to SAGV refactoring patch)
v12: - Fix rebase conflict with own temporary SAGV/QGV fix.
- Remove unnecessary mask being zero check when unmasking qgv points as this is completely legal(Matt Roper)
- Check if we are setting the same mask as already being set in hardware to prevent error from PCode.
- Fix error message when restricting/unrestricting qgv points to "mask/unmask" which sounds more accurate(Matt Roper)
- Move sagv status setting to icl_get_bw_info from atomic check as this should be calculated only once.(Matt Roper)
- Edited comments for the case when we can't enable SAGV and use only 1 QGV point with highest bandwidth to be more understandable.(Matt Roper)
v13: - Moved max_data_rate in bw check to closer scope(Ville Syrjälä)
- Changed comment for zero new_mask in qgv points masking function to better reflect reality(Ville Syrjälä)
- Simplified bit mask operation in qgv points masking function (Ville Syrjälä)
- Moved intel_qgv_points_mask closer to gen11 SAGV disabling, however this still can't be under modeset condition(Ville Syrjälä)
- Packed qgv_points_mask as u8 and moved closer to pipe_sagv_mask (Ville Syrjälä)
- Extracted PCode changes to separate patch.(Ville Syrjälä)
- Now treat num_planes 0 same as 1 to avoid confusion and returning max_bw as 0, which would prevent choosing QGV point having max bandwidth in case if SAGV is not allowed, as per BSpec(Ville Syrjälä)
- Do the actual qgv_points_mask swap in the same place as all other global state parts like cdclk are swapped. In the next patch, this all will be moved to bw state as global state, once new global state patch series from Ville lands
v14: - Now using global state to serialize access to qgv points
- Added global state locking back, otherwise we seem to read bw state in a wrong way.
v15: - Added TODO comment for near atomic global state locking in
bw code.
v16: - Fixed intel_atomic_bw_* functions to be intel_bw_* as discussed
with Jani Nikula.
- Take bw_state_changed flag into use.
v17: - Moved qgv point related manipulations next to SAGV code, as
those are semantically related(Ville Syrjälä)
- Renamed those into intel_sagv_(pre)|(post)_plane_update (Ville Syrjälä)
v18: - Move sagv related calls from commit tail into
intel_sagv_(pre)|(post)_plane_update(Ville Syrjälä)
v19: - Use intel_atomic_get_bw_(old)|(new)_state which is intended
for commit tail stage.
v20: - Return max bandwidth for 0 planes(Ville)
- Constify old_bw_state in bw_atomic_check(Ville)
- Removed some debugs(Ville)
- Added data rate to debug print when no QGV points(Ville)
- Removed some comments(Ville)
v21, v22: - Fixed rebase conflict
--- drivers/gpu/drm/i915/display/intel_bw.c | 139 +++++++++++++----- drivers/gpu/drm/i915/display/intel_bw.h | 9 ++ .../drm/i915/display/intel_display_types.h | 3 + drivers/gpu/drm/i915/intel_pm.c | 65 +++++++- drivers/gpu/drm/i915/intel_pm.h | 2 + 5 files changed, 181 insertions(+), 37 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.c +104 -35
@@ -8,6 +8,9 @@#include "intel_bw.h" #include "intel_display_types.h" #include "intel_sideband.h" +#include "intel_atomic.h" +#include "intel_pm.h" +/* Parameters for Qclk Geyserville (QGV) */ struct intel_qgv_point {
@@ -113,6 +116,26 @@ static int icl_pcode_read_qgv_point_info(struct drm_i915_private *dev_priv,return 0 ; } +int icl_pcode_restrict_qgv_points (struct drm_i915_private *dev_priv, +u32 points_mask) +{ +int ret; + +/* bspec says to keep retrying for at least 1 ms */ + ret =skl_pcode_request (dev_priv,ICL_PCODE_SAGV_DE_MEM_SS_CONFIG , + points_mask, +GEN11_PCODE_POINTS_RESTRICTED_MASK , +GEN11_PCODE_POINTS_RESTRICTED , +1 ); + +if (ret <0 ) { +DRM_ERROR ("Failed to disable qgv points (%d)\n" , ret); +return ret; + } + +return 0 ; +} +static int icl_get_qgv_points (struct drm_i915_private *dev_priv,struct intel_qgv_info *qi) {
@@ -240,6 +263,16 @@ static int icl_get_bw_info(struct drm_i915_private *dev_priv, const struct intelbreak ; } +/* +* In case if SAGV is disabled in BIOS, we always get 1 +* SAGV point, but we can't send PCode commands to restrict it +* as it will fail and pointless anyway. +*/ +if (qi.num_points ==1 ) + dev_priv->sagv_status =I915_SAGV_NOT_CONTROLLED ; +else + dev_priv->sagv_status =I915_SAGV_ENABLED ; +return 0 ; }
@@ -248,6 +281,11 @@ static unsigned int icl_max_bw(struct drm_i915_private *dev_priv, {int i; +/* +* Let's return max bw for 0 planes +*/ + num_planes =max (1 , num_planes); +for (i =0 ; i <ARRAY_SIZE (dev_priv->max_bw); i++) {const struct intel_bw_info *bi = &dev_priv->max_bw[i];
@@ -277,34 +315,6 @@ void intel_bw_init_hw(struct drm_i915_private *dev_priv)icl_get_bw_info (dev_priv, &icl_sa_info); } -static unsigned int intel_max_data_rate (struct drm_i915_private *dev_priv, -int num_planes) -{ -if (INTEL_GEN (dev_priv) >=11 ) { -/* -* Any bw group has same amount of QGV points -*/ -const struct intel_bw_info *bi = - &dev_priv->max_bw[0 ]; -unsigned int min_bw =UINT_MAX ; -int i; - -/* -* FIXME with SAGV disabled maybe we can assume -* point 1 will always be used? Seems to match -* the behaviour observed in the wild. -*/ -for (i =0 ; i < bi->num_qgv_points; i++) { -unsigned int bw =icl_max_bw (dev_priv, num_planes, i); - - min_bw =min (bw, min_bw); - } -return min_bw; - }else { -return UINT_MAX ; - } -} -static unsigned int intel_bw_crtc_num_active_planes (const struct intel_crtc_state *crtc_state) {/*
@@ -415,10 +425,15 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_crtc_state *new_crtc_state, *old_crtc_state;struct intel_bw_state *new_bw_state =NULL ; -unsigned int data_rate, max_data_rate; +const struct intel_bw_state *old_bw_state =NULL ; +unsigned int data_rate;unsigned int num_active_planes;struct intel_crtc *crtc;int i, ret; +u32 allowed_points =0 ; +unsigned int max_bw_point =0 , max_bw =0 ; +unsigned int num_qgv_points = dev_priv->max_bw[0 ].num_qgv_points; +u32 mask = (1 << num_qgv_points) -1 ;/* FIXME earlier gens need some checks too */ if (INTEL_GEN (dev_priv) <11 )
@@ -465,19 +480,73 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)return ret; data_rate =intel_bw_data_rate (dev_priv, new_bw_state); + data_rate =DIV_ROUND_UP (data_rate,1000 ); + num_active_planes =intel_bw_num_active_planes (dev_priv, new_bw_state); - max_data_rate =intel_max_data_rate (dev_priv, num_active_planes); +for (i =0 ; i < num_qgv_points; i++) { +unsigned int max_data_rate; - data_rate =DIV_ROUND_UP (data_rate,1000 ); + max_data_rate =icl_max_bw (dev_priv, num_active_planes, i); +/* +* We need to know which qgv point gives us +* maximum bandwidth in order to disable SAGV +* if we find that we exceed SAGV block time +* with watermarks. By that moment we already +* have those, as it is calculated earlier in +* intel_atomic_check, +*/ +if (max_data_rate > max_bw) { + max_bw_point = i; + max_bw = max_data_rate; + } +if (max_data_rate >= data_rate) + allowed_points |=BIT (i); +DRM_DEBUG_KMS ("QGV point %d: max bw %d required %d\n" , + i, max_data_rate, data_rate); + } -if (data_rate > max_data_rate) { -drm_dbg_kms (&dev_priv->drm, -"Bandwidth %u MB/s exceeds max available %d MB/s (%d active planes)\n" , - data_rate, max_data_rate, num_active_planes); +/* +* BSpec states that we always should have at least one allowed point +* left, so if we couldn't - simply reject the configuration for obvious +* reasons. +*/ +if (allowed_points ==0 ) { +DRM_DEBUG_KMS ("No QGV points provide sufficient memory" +" bandwidth %d for display configuration.\n" , data_rate);return -EINVAL ; } +/* +* Leave only single point with highest bandwidth, if +* we can't enable SAGV due to the increased memory latency it may +* cause. +*/ +if (!intel_can_enable_sagv (new_bw_state)) { + allowed_points =BIT (max_bw_point); +DRM_DEBUG_KMS ("No SAGV, using single QGV point %d\n" , + max_bw_point); + } +/* +* We store the ones which need to be masked as that is what PCode +* actually accepts as a parameter. +*/ + new_bw_state->qgv_points_mask = (~allowed_points) & mask; + + old_bw_state =intel_atomic_get_old_bw_state (state); +if (!old_bw_state) +return -EINVAL ; + +/* +* If the actual mask had changed we need to make sure that +* the commits are serialized(in case this is a nomodeset, nonblocking) +*/ +if (new_bw_state->qgv_points_mask != old_bw_state->qgv_points_mask) { + ret =intel_atomic_serialize_global_state (&new_bw_state->base); +if (ret) +return ret; + } +return 0 ; }
drivers/gpu/drm/i915/display/intel_bw.h +9 -0
@@ -24,6 +24,13 @@ struct intel_bw_state {*/ u8 pipe_sagv_reject; +/* +* Current QGV points mask, which restricts +* some particular SAGV states, not to confuse +* with pipe_sagv_mask. +*/ +u8 qgv_points_mask; +unsigned int data_rate[I915_MAX_PIPES ];u8 num_active_planes[I915_MAX_PIPES ]; };
@@ -44,5 +51,7 @@ int intel_bw_init(struct drm_i915_private *dev_priv);int intel_bw_atomic_check (struct intel_atomic_state *state);void intel_bw_crtc_update (struct intel_bw_state *bw_state,const struct intel_crtc_state *crtc_state); +int icl_pcode_restrict_qgv_points (struct drm_i915_private *dev_priv, +u32 points_mask);#endif /* __INTEL_BW_H__ */
drivers/gpu/drm/i915/display/intel_display_types.h +3 -0
@@ -693,6 +693,9 @@ struct skl_plane_wm {bool is_planar; }; +/* BSpec precisely defines this */ +#define NUM_SAGV_POINTS 8 +struct skl_pipe_wm {struct skl_plane_wm planes[I915_MAX_PLANES ];bool can_sagv;
drivers/gpu/drm/i915/intel_pm.c +63 -2
92 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.h +2 -0
@@ -42,6 +42,8 @@ void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, struct skl_pipe_wm *out);void g4x_wm_sanitize (struct drm_i915_private *dev_priv);void vlv_wm_sanitize (struct drm_i915_private *dev_priv); +void intel_sagv_pre_plane_update (struct intel_atomic_state *state); +void intel_sagv_post_plane_update (struct intel_atomic_state *state);bool intel_has_sagv (struct drm_i915_private *dev_priv);bool intel_can_enable_sagv (const struct intel_bw_state *bw_state);int intel_enable_sagv (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v25 10/11 drm/i915: Restrict qgv points which don't have enough bandwidth.
According to BSpec 53998, we should try to restrict qgv points, which can't provide enough bandwidth for desired display configuration.
Currently we are just comparing against all of
those and take minimum(worst case).
v2: Fixed wrong PCode reply mask, removed hardcoded
values.
v3: Forbid simultaneous legacy SAGV PCode requests and
restricting qgv points. Put the actual restriction to commit function, added serialization(thanks to Ville) to prevent commit being applied out of order in case of nonblocking and/or nomodeset commits.
v4:
- Minor code refactoring, fixed few typos(thanks to James Ausmus)
- Change the naming of qgv point
masking/unmasking functions(James Ausmus).
- Simplify the masking/unmasking operation itself,
as we don't need to mask only single point per request(James Ausmus)
- Reject and stick to highest bandwidth point if SAGV can't be enabled(BSpec)
v5:
- Add new mailbox reply codes, which seems to happen during boot time for TGL and indicate that QGV setting is not yet available.
v6:
- Increase number of supported QGV points to be in sync with BSpec.
v7: - Rebased and resolved conflict to fix build failure.
- Fix NUM_QGV_POINTS to 8 and moved that to header file(James Ausmus)
v8: - Don't report an error if we can't restrict qgv points, as SAGV
can be disabled by BIOS, which is completely legal. So don't make CI panic. Instead if we detect that there is only 1 QGV point accessible just analyze if we can fit the required bandwidth requirements, but no need in restricting.
v9: - Fix wrong QGV transition if we have 0 planes and no SAGV
simultaneously.
v10: - Fix CDCLK corruption, because of global state getting serialized
without modeset, which caused copying of non-calculated cdclk to be copied to dev_priv(thanks to Ville for the hint).
v11: - Remove unneeded headers and spaces(Matthew Roper)
- Remove unneeded intel_qgv_info qi struct from bw check and zero out the needed one(Matthew Roper)
- Changed QGV error message to have more clear meaning(Matthew Roper)
- Use state->modeset_set instead of any_ms(Matthew Roper)
- Moved NUM_SAGV_POINTS from i915_reg.h to i915_drv.h where it's used
- Keep using crtc_state->hw.active instead of .enable(Matthew Roper)
- Moved unrelated changes to other patch(using latency as parameter for plane wm calculation, moved to SAGV refactoring patch)
v12: - Fix rebase conflict with own temporary SAGV/QGV fix.
- Remove unnecessary mask being zero check when unmasking qgv points as this is completely legal(Matt Roper)
- Check if we are setting the same mask as already being set in hardware to prevent error from PCode.
- Fix error message when restricting/unrestricting qgv points to "mask/unmask" which sounds more accurate(Matt Roper)
- Move sagv status setting to icl_get_bw_info from atomic check as this should be calculated only once.(Matt Roper)
- Edited comments for the case when we can't enable SAGV and use only 1 QGV point with highest bandwidth to be more understandable.(Matt Roper)
v13: - Moved max_data_rate in bw check to closer scope(Ville Syrjälä)
- Changed comment for zero new_mask in qgv points masking function to better reflect reality(Ville Syrjälä)
- Simplified bit mask operation in qgv points masking function (Ville Syrjälä)
- Moved intel_qgv_points_mask closer to gen11 SAGV disabling, however this still can't be under modeset condition(Ville Syrjälä)
- Packed qgv_points_mask as u8 and moved closer to pipe_sagv_mask (Ville Syrjälä)
- Extracted PCode changes to separate patch.(Ville Syrjälä)
- Now treat num_planes 0 same as 1 to avoid confusion and returning max_bw as 0, which would prevent choosing QGV point having max bandwidth in case if SAGV is not allowed, as per BSpec(Ville Syrjälä)
- Do the actual qgv_points_mask swap in the same place as all other global state parts like cdclk are swapped. In the next patch, this all will be moved to bw state as global state, once new global state patch series from Ville lands
v14: - Now using global state to serialize access to qgv points
- Added global state locking back, otherwise we seem to read bw state in a wrong way.
v15: - Added TODO comment for near atomic global state locking in
bw code.
v16: - Fixed intel_atomic_bw_* functions to be intel_bw_* as discussed
with Jani Nikula.
- Take bw_state_changed flag into use.
v17: - Moved qgv point related manipulations next to SAGV code, as
those are semantically related(Ville Syrjälä)
- Renamed those into intel_sagv_(pre)|(post)_plane_update (Ville Syrjälä)
v18: - Move sagv related calls from commit tail into
intel_sagv_(pre)|(post)_plane_update(Ville Syrjälä)
v19: - Use intel_atomic_get_bw_(old)|(new)_state which is intended
for commit tail stage.
v20: - Return max bandwidth for 0 planes(Ville)
- Constify old_bw_state in bw_atomic_check(Ville)
- Removed some debugs(Ville)
- Added data rate to debug print when no QGV points(Ville)
- Removed some comments(Ville)
v21, v22, v23: - Fixed rebase conflict
--- drivers/gpu/drm/i915/display/intel_bw.c | 139 +++++++++++++----- drivers/gpu/drm/i915/display/intel_bw.h | 9 ++ .../drm/i915/display/intel_display_types.h | 3 + drivers/gpu/drm/i915/intel_pm.c | 66 ++++++++- drivers/gpu/drm/i915/intel_pm.h | 2 + 5 files changed, 181 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.c +104 -35
@@ -8,6 +8,9 @@#include "intel_bw.h" #include "intel_display_types.h" #include "intel_sideband.h" +#include "intel_atomic.h" +#include "intel_pm.h" +/* Parameters for Qclk Geyserville (QGV) */ struct intel_qgv_point {
@@ -113,6 +116,26 @@ static int icl_pcode_read_qgv_point_info(struct drm_i915_private *dev_priv,return 0 ; } +int icl_pcode_restrict_qgv_points (struct drm_i915_private *dev_priv, +u32 points_mask) +{ +int ret; + +/* bspec says to keep retrying for at least 1 ms */ + ret =skl_pcode_request (dev_priv,ICL_PCODE_SAGV_DE_MEM_SS_CONFIG , + points_mask, +GEN11_PCODE_POINTS_RESTRICTED_MASK , +GEN11_PCODE_POINTS_RESTRICTED , +1 ); + +if (ret <0 ) { +DRM_ERROR ("Failed to disable qgv points (%d)\n" , ret); +return ret; + } + +return 0 ; +} +static int icl_get_qgv_points (struct drm_i915_private *dev_priv,struct intel_qgv_info *qi) {
@@ -240,6 +263,16 @@ static int icl_get_bw_info(struct drm_i915_private *dev_priv, const struct intelbreak ; } +/* +* In case if SAGV is disabled in BIOS, we always get 1 +* SAGV point, but we can't send PCode commands to restrict it +* as it will fail and pointless anyway. +*/ +if (qi.num_points ==1 ) + dev_priv->sagv_status =I915_SAGV_NOT_CONTROLLED ; +else + dev_priv->sagv_status =I915_SAGV_ENABLED ; +return 0 ; }
@@ -248,6 +281,11 @@ static unsigned int icl_max_bw(struct drm_i915_private *dev_priv, {int i; +/* +* Let's return max bw for 0 planes +*/ + num_planes =max (1 , num_planes); +for (i =0 ; i <ARRAY_SIZE (dev_priv->max_bw); i++) {const struct intel_bw_info *bi = &dev_priv->max_bw[i];
@@ -277,34 +315,6 @@ void intel_bw_init_hw(struct drm_i915_private *dev_priv)icl_get_bw_info (dev_priv, &icl_sa_info); } -static unsigned int intel_max_data_rate (struct drm_i915_private *dev_priv, -int num_planes) -{ -if (INTEL_GEN (dev_priv) >=11 ) { -/* -* Any bw group has same amount of QGV points -*/ -const struct intel_bw_info *bi = - &dev_priv->max_bw[0 ]; -unsigned int min_bw =UINT_MAX ; -int i; - -/* -* FIXME with SAGV disabled maybe we can assume -* point 1 will always be used? Seems to match -* the behaviour observed in the wild. -*/ -for (i =0 ; i < bi->num_qgv_points; i++) { -unsigned int bw =icl_max_bw (dev_priv, num_planes, i); - - min_bw =min (bw, min_bw); - } -return min_bw; - }else { -return UINT_MAX ; - } -} -static unsigned int intel_bw_crtc_num_active_planes (const struct intel_crtc_state *crtc_state) {/*
@@ -415,10 +425,15 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_crtc_state *new_crtc_state, *old_crtc_state;struct intel_bw_state *new_bw_state =NULL ; -unsigned int data_rate, max_data_rate; +const struct intel_bw_state *old_bw_state =NULL ; +unsigned int data_rate;unsigned int num_active_planes;struct intel_crtc *crtc;int i, ret; +u32 allowed_points =0 ; +unsigned int max_bw_point =0 , max_bw =0 ; +unsigned int num_qgv_points = dev_priv->max_bw[0 ].num_qgv_points; +u32 mask = (1 << num_qgv_points) -1 ;/* FIXME earlier gens need some checks too */ if (INTEL_GEN (dev_priv) <11 )
@@ -465,19 +480,73 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)return ret; data_rate =intel_bw_data_rate (dev_priv, new_bw_state); + data_rate =DIV_ROUND_UP (data_rate,1000 ); + num_active_planes =intel_bw_num_active_planes (dev_priv, new_bw_state); - max_data_rate =intel_max_data_rate (dev_priv, num_active_planes); +for (i =0 ; i < num_qgv_points; i++) { +unsigned int max_data_rate; - data_rate =DIV_ROUND_UP (data_rate,1000 ); + max_data_rate =icl_max_bw (dev_priv, num_active_planes, i); +/* +* We need to know which qgv point gives us +* maximum bandwidth in order to disable SAGV +* if we find that we exceed SAGV block time +* with watermarks. By that moment we already +* have those, as it is calculated earlier in +* intel_atomic_check, +*/ +if (max_data_rate > max_bw) { + max_bw_point = i; + max_bw = max_data_rate; + } +if (max_data_rate >= data_rate) + allowed_points |=BIT (i); +DRM_DEBUG_KMS ("QGV point %d: max bw %d required %d\n" , + i, max_data_rate, data_rate); + } -if (data_rate > max_data_rate) { -drm_dbg_kms (&dev_priv->drm, -"Bandwidth %u MB/s exceeds max available %d MB/s (%d active planes)\n" , - data_rate, max_data_rate, num_active_planes); +/* +* BSpec states that we always should have at least one allowed point +* left, so if we couldn't - simply reject the configuration for obvious +* reasons. +*/ +if (allowed_points ==0 ) { +DRM_DEBUG_KMS ("No QGV points provide sufficient memory" +" bandwidth %d for display configuration.\n" , data_rate);return -EINVAL ; } +/* +* Leave only single point with highest bandwidth, if +* we can't enable SAGV due to the increased memory latency it may +* cause. +*/ +if (!intel_can_enable_sagv (new_bw_state)) { + allowed_points =BIT (max_bw_point); +DRM_DEBUG_KMS ("No SAGV, using single QGV point %d\n" , + max_bw_point); + } +/* +* We store the ones which need to be masked as that is what PCode +* actually accepts as a parameter. +*/ + new_bw_state->qgv_points_mask = (~allowed_points) & mask; + + old_bw_state =intel_atomic_get_old_bw_state (state); +if (!old_bw_state) +return -EINVAL ; + +/* +* If the actual mask had changed we need to make sure that +* the commits are serialized(in case this is a nomodeset, nonblocking) +*/ +if (new_bw_state->qgv_points_mask != old_bw_state->qgv_points_mask) { + ret =intel_atomic_serialize_global_state (&new_bw_state->base); +if (ret) +return ret; + } +return 0 ; }
drivers/gpu/drm/i915/display/intel_bw.h +9 -0
@@ -24,6 +24,13 @@ struct intel_bw_state {*/ u8 pipe_sagv_reject; +/* +* Current QGV points mask, which restricts +* some particular SAGV states, not to confuse +* with pipe_sagv_mask. +*/ +u8 qgv_points_mask; +unsigned int data_rate[I915_MAX_PIPES ];u8 num_active_planes[I915_MAX_PIPES ]; };
@@ -44,5 +51,7 @@ int intel_bw_init(struct drm_i915_private *dev_priv);int intel_bw_atomic_check (struct intel_atomic_state *state);void intel_bw_crtc_update (struct intel_bw_state *bw_state,const struct intel_crtc_state *crtc_state); +int icl_pcode_restrict_qgv_points (struct drm_i915_private *dev_priv, +u32 points_mask);#endif /* __INTEL_BW_H__ */
drivers/gpu/drm/i915/display/intel_display_types.h +3 -0
@@ -693,6 +693,9 @@ struct skl_plane_wm {bool is_planar; }; +/* BSpec precisely defines this */ +#define NUM_SAGV_POINTS 8 +struct skl_pipe_wm {struct skl_plane_wm planes[I915_MAX_PLANES ];bool can_sagv;
drivers/gpu/drm/i915/intel_pm.c +63 -3
93 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.h +2 -0
@@ -42,6 +42,8 @@ void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, struct skl_pipe_wm *out);void g4x_wm_sanitize (struct drm_i915_private *dev_priv);void vlv_wm_sanitize (struct drm_i915_private *dev_priv); +void intel_sagv_pre_plane_update (struct intel_atomic_state *state); +void intel_sagv_post_plane_update (struct intel_atomic_state *state);bool intel_can_enable_sagv (const struct intel_bw_state *bw_state);int intel_enable_sagv (struct drm_i915_private *dev_priv);int intel_disable_sagv (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v24 11/11 drm/i915: Enable SAGV support for Gen12
In reply to Stanislav LisovskiyFlip the switch and enable SAGV support
for Gen12 also.
--- drivers/gpu/drm/i915/intel_pm.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -4
@@ -3638,10 +3638,6 @@ static bool skl_needs_memory_bw_wa(struct drm_i915_private *dev_priv)bool intel_has_sagv (struct drm_i915_private *dev_priv) { -/* HACK! */ -if (IS_GEN (dev_priv,12 )) -return false; -return (IS_GEN9_BC (dev_priv) ||INTEL_GEN (dev_priv) >=10 ) && dev_priv->sagv_status !=I915_SAGV_NOT_CONTROLLED ; }
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.DOCS: warning for SAGV support for Gen12+ (rev21)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: SAGV support for Gen12+ (rev21)
URL : https://patchwork.freedesktop.org/series/75129/
State : warning
== Summary ==
$ make htmldocs 2>&1 > /dev/null | grep i915 /home/cidrm/kernel/Documentation/gpu/i915.rst:610: WARNING: duplicate label gpu/i915:layout, other instance in /home/cidrm/kernel/Documentation/gpu/i915.rst
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for SAGV support for Gen12+ (rev21)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: SAGV support for Gen12+ (rev21)
URL : https://patchwork.freedesktop.org/series/75129/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8301 -> Patchwork_17312
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/index.html
Known issues
------------
Here are the changes found in Patchwork_17312 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium@dp-crc-fast:
- fi-cml-u2: [PASS][1] -> [FAIL][2] ([i915#262])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/fi-cml-u2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/fi-cml-u2/igt@[email protected]
* igt@kms_chamelium@dp-edid-read:
- fi-kbl-7500u: [PASS][3] -> [FAIL][4] ([i915#976])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/fi-kbl-7500u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/fi-kbl-7500u/igt@[email protected]
[i915#262]: https://gitlab.freedesktop.org/drm/intel/issues/262
[i915#976]: https://gitlab.freedesktop.org/drm/intel/issues/976
Participating hosts (50 -> 46)
------------------------------
Additional (2): fi-skl-6770hq fi-cfl-8700k
Missing (6): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8301 -> Patchwork_17312
CI-20190529: 20190529
CI_DRM_8301: 7d2bdd2df0d18945bb274de8bc7560e14779e346 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5590: c7b4a43942be32245b1c00b5b4a38401d8ca6e0d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17312: 3c3c3aee4a13b8d753382a38abac2e0e584a289c @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
3c3c3aee4a13 drm/i915: Enable SAGV support for Gen121d0b2628bf63 drm/i915: Restrict qgv points which don't have enough bandwidth. 2bcb0ac00e91 drm/i915: Rename bw_state to new_bw_state87e08994a2d3 drm/i915: Added required new PCode commands58e617a267af drm/i915: Add TGL+ SAGV support72a0e43e6287 drm/i915: Separate icl and skl SAGV checking817a1d87036f drm/i915: Use bw state for per crtc SAGV evaluation 98e73fa91e4b drm/i915: Add pre/post plane updates for SAGV908804d8526f drm/i915: Prepare to extract gen specific functions from intel_can_enable_sagv 6e5b0cfb1a19 drm/i915: Add intel_atomic_get_bw_*_state helpers6626e1b28f68 drm/i915: Introduce skl_plane_wm_level accessor.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for SAGV support for Gen12+ (rev21)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: SAGV support for Gen12+ (rev21)
URL : https://patchwork.freedesktop.org/series/75129/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8301_full -> Patchwork_17312_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_17312_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_draw_crc@draw-method-rgb565-render-untiled:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#52] / [i915#54]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-glk9/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-glk2/igt@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
- shard-glk: [PASS][3] -> [FAIL][4] ([i915#79])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-glk1/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-glk9/igt@[email protected]
* igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#34])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-glk8/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-glk7/igt@[email protected]
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][7] -> [FAIL][8] ([i915#1188])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-skl4/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-skl5/igt@[email protected]
#### Possible fixes ####
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][9] ([i915#454]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-iclb2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-iclb1/igt@[email protected]
* igt@i915_selftest@live@requests:
- shard-tglb: [INCOMPLETE][11] ([i915#1531]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-tglb1/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-tglb8/igt@i915_selftest@[email protected]
* igt@i915_suspend@debugfs-reader:
- shard-skl: [INCOMPLETE][13] ([i915#69]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-skl6/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-skl8/igt@[email protected]
* igt@i915_suspend@sysfs-reader:
- shard-apl: [DMESG-WARN][15] ([i915#180]) -> [PASS][16] +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-apl4/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-apl3/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [DMESG-WARN][17] ([i915#180]) -> [PASS][18] +6 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-kbl7/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-kbl2/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-crc-legacy:
- shard-glk: [FAIL][19] ([i915#1566]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-glk5/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-glk4/igt@[email protected]
* igt@kms_flip@2x-plain-flip-fb-recreate:
- shard-glk: [FAIL][21] ([i915#34]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-glk8/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-glk2/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [FAIL][23] ([i915#79]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-skl7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-skl2/igt@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [FAIL][25] ([i915#1188]) -> [PASS][26] +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-skl3/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-skl5/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][27] ([fdo#108145] / [i915#265]) -> [PASS][28] +2 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-skl7/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-skl10/igt@[email protected]
* igt@kms_psr@psr2_sprite_mmap_cpu:
- shard-iclb: [SKIP][29] ([fdo#109441]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-iclb1/igt@kms_psr@psr2_sprite_mmap_cpu.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_cpu.html
* igt@kms_setmode@basic:
- shard-hsw: [FAIL][31] ([i915#31]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-hsw8/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-hsw4/igt@[email protected]
- shard-kbl: [FAIL][33] ([i915#31] / [i915#93] / [i915#95]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-kbl6/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-kbl7/igt@[email protected]
* {igt@perf@polling-parameterized}:
- shard-hsw: [FAIL][35] ([i915#1542]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-hsw6/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-hsw7/igt@[email protected]
#### Warnings ####
* igt@kms_frontbuffer_tracking@fbc-badstride:
- shard-apl: [FAIL][37] ([i915#49] / [i915#95]) -> [FAIL][38] ([i915#49])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-apl8/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-apl1/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-iclb: [FAIL][39] ([i915#608]) -> [SKIP][40] ([fdo#109642] / [fdo#111068])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8301/shard-iclb2/igt@kms_psr2_su@page_flip.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/shard-iclb1/igt@kms_psr2_su@page_flip.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1531]: https://gitlab.freedesktop.org/drm/intel/issues/1531
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1566]: https://gitlab.freedesktop.org/drm/intel/issues/1566
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#52]: https://gitlab.freedesktop.org/drm/intel/issues/52
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#608]: https://gitlab.freedesktop.org/drm/intel/issues/608
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8301 -> Patchwork_17312
CI-20190529: 20190529
CI_DRM_8301: 7d2bdd2df0d18945bb274de8bc7560e14779e346 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5590: c7b4a43942be32245b1c00b5b4a38401d8ca6e0d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17312: 3c3c3aee4a13b8d753382a38abac2e0e584a289c @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17312/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for SAGV support for Gen12+ (rev25)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: SAGV support for Gen12+ (rev25)
URL : https://patchwork.freedesktop.org/series/75129/
State : failure
== Summary ==
Applying: drm/i915: Introduce skl_plane_wm_level accessor.
Applying: drm/i915: Add intel_atomic_get_bw_*_state helpers
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_bw.c
M drivers/gpu/drm/i915/display/intel_bw.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915: Prepare to extract gen specific functions from intel_can_enable_sagv Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/i915: Prepare to extract gen specific functions from intel_can_enable_sagv When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for SAGV support for Gen12+ (rev25)
Looks like I'l have to resend the series, because patches 2,3,4 were now pushed and git am fails to reapply those as part of this series, when I first sent those as in-reply.
Best Regards,
Lisovskiy Stanislav
Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
________________________________________
From: Patchwork <[email protected]>
Sent: Monday, April 20, 2020 11:58:54 AM
To: Lisovskiy, Stanislav
Cc: [email protected]
Subject: ✗ Fi.CI.BUILD: failure for SAGV support for Gen12+ (rev25)
== Series Details ==
Series: SAGV support for Gen12+ (rev25)
URL : https://patchwork.freedesktop.org/series/75129/
State : failure
== Summary ==
Applying: drm/i915: Introduce skl_plane_wm_level accessor.
Applying: drm/i915: Add intel_atomic_get_bw_*_state helpers
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_bw.c
M drivers/gpu/drm/i915/display/intel_bw.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915: Prepare to extract gen specific functions from intel_can_enable_sagv Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/i915: Prepare to extract gen specific functions from intel_can_enable_sagv When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx