Refactor Gen11+ SAGV support
Subsystems (3)
v18 cover Refactor Gen11+ SAGV support
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+.
v17: Had to rebase the whole series.
v18: Resent whole series as new patch was introduced.
Stanislav Lisovskiy (8):
drm/i915: Start passing latency as parameter drm/i915: Introduce skl_plane_wm_level accessor. drm/i915: Add intel_bw_get_*_state helpers
drm/i915: Introduce more *_state_changed indicators drm/i915: Refactor intel_can_enable_sagv
drm/i915: Added required new PCode commands
drm/i915: Restrict qgv points which don't have enough bandwidth. drm/i915: Enable SAGV support for Gen12
drivers/gpu/drm/i915/display/intel_atomic.c | 2 + drivers/gpu/drm/i915/display/intel_bw.c | 211 +++++-- drivers/gpu/drm/i915/display/intel_bw.h | 36 ++ drivers/gpu/drm/i915/display/intel_display.c | 141 ++++- .../drm/i915/display/intel_display_types.h | 34 +- drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_pm.c | 581 +++++++++++++++--- drivers/gpu/drm/i915/intel_pm.h | 4 +- drivers/gpu/drm/i915/intel_sideband.c | 2 + 10 files changed, 864 insertions(+), 154 deletions(-)
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v18 1/8 drm/i915: Start passing latency as parameter
We need to start passing memory latency as a parameter when calculating plane wm levels, as latency can get changed in different circumstances(for example with or without SAGV). So we need to be more flexible on that matter.
--- drivers/gpu/drm/i915/intel_pm.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +8 -4
@@ -4002,6 +4002,7 @@ static int skl_compute_wm_params(const struct intel_crtc_state *crtc_state, int color_plane);static void skl_compute_plane_wm (const struct intel_crtc_state *crtc_state,int level, +u32 latency,const struct skl_wm_params *wp,const struct skl_wm_level *result_prev,struct skl_wm_level *result/* out */ );
@@ -4024,7 +4025,9 @@ skl_cursor_allocation(const struct intel_crtc_state *crtc_state,drm_WARN_ON (&dev_priv->drm, ret);for (level =0 ; level <= max_level; level++) { -skl_compute_plane_wm (crtc_state, level, &wp, &wm, &wm); +u32 latency = dev_priv->wm.skl_latency[level]; + +skl_compute_plane_wm (crtc_state, level, latency, &wp, &wm, &wm);if (wm.min_ddb_alloc ==U16_MAX )break ;
@@ -4978,12 +4981,12 @@ static bool skl_wm_has_lines(struct drm_i915_private *dev_priv, int level)static void skl_compute_plane_wm (const struct intel_crtc_state *crtc_state,int level, +u32 latency,const struct skl_wm_params *wp,const struct skl_wm_level *result_prev,struct skl_wm_level *result/* out */ ) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); -u32 latency = dev_priv->wm.skl_latency[level];uint_fixed_16_16_t method1, method2;uint_fixed_16_16_t selected_result;u32 res_blocks, res_lines, min_ddb_alloc =0 ;
@@ -5112,9 +5115,10 @@ skl_compute_wm_levels(const struct intel_crtc_state *crtc_state,for (level =0 ; level <= max_level; level++) {struct skl_wm_level *result = &levels[level]; +u32 latency = dev_priv->wm.skl_latency[level]; -skl_compute_plane_wm (crtc_state, level, wm_params, - result_prev, result); +skl_compute_plane_wm (crtc_state, level, latency, + wm_params, result_prev, result); result_prev = result; }
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 v18 1/8] drm/i915: Start passing latency as parameter
Quoted 16 lines · Stanislav Lisovskiy
We need to start passing memory latency as a parameter when calculating plane wm levels, as latency can get changed in different circumstances(for example with or without SAGV). So we need to be more flexible on that matter.
Signed-off-by Stanislav Lisovskiy <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c static int skl_compute_wm_params(const struct intel_crtc_state *crtc_state, · line 4005
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -4002,6 +4002,7 @@ static int skl_compute_wm_params(const struct intel_crtc_state *crtc_state, int color_plane); static void skl_compute_plane_wm(const struct intel_crtc_state *crtc_state, int level, + u32 latency,
I'd make it just unsigned int or something all over. Otherwise lgtm
Quoted 43 lines
drivers/gpu/drm/i915/intel_pm.c +7
-4const struct skl_wm_params *wp, const struct skl_wm_level *result_prev, struct skl_wm_level *result /* out */);@@ -4024,7 +4025,9 @@ skl_cursor_allocation(const struct intel_crtc_state *crtc_state,drm_WARN_ON (&dev_priv->drm, ret);for (level =0 ; level <= max_level; level++) { -skl_compute_plane_wm (crtc_state, level, &wp, &wm, &wm); +u32 latency = dev_priv->wm.skl_latency[level]; + +skl_compute_plane_wm (crtc_state, level, latency, &wp, &wm, &wm);if (wm.min_ddb_alloc ==U16_MAX )break ;@@ -4978,12 +4981,12 @@ static bool skl_wm_has_lines(struct drm_i915_private *dev_priv, int level)static void skl_compute_plane_wm (const struct intel_crtc_state *crtc_state,int level, +u32 latency,const struct skl_wm_params *wp,const struct skl_wm_level *result_prev,struct skl_wm_level *result/* out */ ) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); -u32 latency = dev_priv->wm.skl_latency[level];uint_fixed_16_16_t method1, method2;uint_fixed_16_16_t selected_result;u32 res_blocks, res_lines, min_ddb_alloc =0 ;@@ -5112,9 +5115,10 @@ skl_compute_wm_levels(const struct intel_crtc_state *crtc_state,for (level =0 ; level <= max_level; level++) {struct skl_wm_level *result = &levels[level]; +u32 latency = dev_priv->wm.skl_latency[level]; -skl_compute_plane_wm (crtc_state, level, wm_params, - result_prev, result); +skl_compute_plane_wm (crtc_state, level, latency, + wm_params, result_prev, result); result_prev = result; }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 v18 2/8 drm/i915: Introduce skl_plane_wm_level accessor.
In reply to Stanislav LisovskiyFor 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
--- drivers/gpu/drm/i915/intel_pm.c | 120 +++++++++++++++++++++----------- 1 file changed, 81 insertions(+), 39 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +81 -39
@@ -4548,6 +4548,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 (struct intel_plane *plane, +const struct intel_crtc_state *crtc_state, +int level, +int color_plane) +{ +const struct skl_plane_wm *wm = + &crtc_state->wm.skl.optimal.planes[plane->id]; + +return color_plane ? &wm->uv_wm[level] : &wm->wm[level]; +} +static int skl_allocate_pipe_ddb (struct intel_crtc_state *crtc_state) {
@@ -4560,7 +4572,7 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)u16 total[I915_MAX_PLANES ] = {};u16 uv_total[I915_MAX_PLANES ] = {};u64 total_data_rate; -enum plane_id plane_id; +struct intel_plane *plane;int num_active;u64 plane_data_rate[I915_MAX_PLANES ] = {};u64 uv_plane_data_rate[I915_MAX_PLANES ] = {};
@@ -4612,22 +4624,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 (intel_crtc, plane_id) { -const struct skl_plane_wm *wm = - &crtc_state->wm.skl.optimal.planes[plane_id]; -if (plane_id ==PLANE_CURSOR ) { -if (wm->wm[level].min_ddb_alloc > total[PLANE_CURSOR ]) { +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) { +const struct skl_wm_level *wm_level; +const struct skl_wm_level *wm_uv_level; + + wm_level =skl_plane_wm_level (plane, crtc_state, + level, false); + wm_uv_level =skl_plane_wm_level (plane, crtc_state, + level, true); + +if (plane->id ==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) {
@@ -4649,13 +4667,18 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)* watermark level, plus an extra share of the leftover blocks * proportional to its relative data rate. */ -for_each_plane_id_on_crtc (intel_crtc, plane_id) { -const struct skl_plane_wm *wm = - &crtc_state->wm.skl.optimal.planes[plane_id]; +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) { +const struct skl_wm_level *wm_level; +const struct skl_wm_level *wm_uv_level;u64 rate;u16 extra; -if (plane_id ==PLANE_CURSOR ) + wm_level =skl_plane_wm_level (plane, crtc_state, + level, false); + wm_uv_level =skl_plane_wm_level (plane, crtc_state, + level, true); + +if (plane->id ==PLANE_CURSOR )continue ;/*
@@ -4665,22 +4688,22 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)if (total_data_rate ==0 )break ; - rate = plane_data_rate[plane_id]; + rate = plane_data_rate[plane->id]; 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;if (total_data_rate ==0 )break ; - rate = uv_plane_data_rate[plane_id]; + rate = uv_plane_data_rate[plane->id]; 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; }
@@ -4688,29 +4711,29 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)/* Set the actual DDB start/end points for each plane */ start = alloc->start; -for_each_plane_id_on_crtc (intel_crtc, plane_id) { +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) {struct skl_ddb_entry *plane_alloc = - &crtc_state->wm.skl.plane_ddb_y[plane_id]; + &crtc_state->wm.skl.plane_ddb_y[plane->id];struct skl_ddb_entry *uv_plane_alloc = - &crtc_state->wm.skl.plane_ddb_uv[plane_id]; + &crtc_state->wm.skl.plane_ddb_uv[plane->id]; -if (plane_id ==PLANE_CURSOR ) +if (plane->id ==PLANE_CURSOR )continue ;/* Gen11+ uses a separate plane for UV watermarks */ drm_WARN_ON (&dev_priv->drm, -INTEL_GEN (dev_priv) >=11 && uv_total[plane_id]); +INTEL_GEN (dev_priv) >=11 && uv_total[plane->id]);/* Leave disabled planes at (0,0) */ -if (total[plane_id]) { +if (total[plane->id]) { plane_alloc->start = start; - start += total[plane_id]; + start += total[plane->id]; plane_alloc->end = start; } -if (uv_total[plane_id]) { +if (uv_total[plane->id]) { uv_plane_alloc->start = start; - start += uv_total[plane_id]; + start += uv_total[plane->id]; uv_plane_alloc->end = start; } }
@@ -4722,9 +4745,16 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)* that aren't actually possible. */ for (level++; level <=ilk_wm_max_level (dev_priv); level++) { -for_each_plane_id_on_crtc (intel_crtc, plane_id) { +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) { +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]; + &crtc_state->wm.skl.optimal.planes[plane->id]; + + wm_level =skl_plane_wm_level (plane, crtc_state, + level, false); + wm_uv_level =skl_plane_wm_level (plane, crtc_state, + level, true);/* * We only disable the watermarks for each plane if
@@ -4738,9 +4768,10 @@ 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 (struct skl_wm_level ));/* * Wa_1408961008:icl, ehl
@@ -4748,9 +4779,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 (plane, crtc_state, +0 , false); + 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; } } }
@@ -4759,11 +4795,11 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)* Go back and disable the transition watermark if it turns out we * don't have enough DDB blocks for it. */ -for_each_plane_id_on_crtc (intel_crtc, plane_id) { +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) {struct skl_plane_wm *wm = - &crtc_state->wm.skl.optimal.planes[plane_id]; + &crtc_state->wm.skl.optimal.planes[plane->id]; -if (wm->trans_wm.plane_res_b >= total[plane_id]) +if (wm->trans_wm.plane_res_b >= total[plane->id])memset (&wm->trans_wm,0 ,sizeof (wm->trans_wm)); }
@@ -5354,10 +5390,13 @@ void skl_write_plane_wm(struct intel_plane *plane, &crtc_state->wm.skl.plane_ddb_y[plane_id];const struct skl_ddb_entry *ddb_uv = &crtc_state->wm.skl.plane_ddb_uv[plane_id]; +const struct skl_wm_level *wm_level;for (level =0 ; level <= max_level; level++) { + wm_level =skl_plane_wm_level (plane, crtc_state, level, false); +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);
@@ -5388,10 +5427,13 @@ void skl_write_cursor_wm(struct intel_plane *plane, &crtc_state->wm.skl.optimal.planes[plane_id];const struct skl_ddb_entry *ddb = &crtc_state->wm.skl.plane_ddb_y[plane_id]; +const struct skl_wm_level *wm_level;for (level =0 ; level <= max_level; level++) { + wm_level =skl_plane_wm_level (plane, crtc_state, level, false); +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
Re: [Intel-gfx] [PATCH v18 2/8] drm/i915: Introduce skl_plane_wm_level accessor.
Quoted 4 lines · Stanislav Lisovskiy
For future Gen12 SAGV implementation we need to seemlessly alter wm levels calculated, depending on whether we are allowed to enable SAGV or not.
Quoted 8 lines
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ä)
When did I say that? Can't find a previous review of this patch. Anywyas, that change seems to cause a lot of needless noise into the patch, and atm I can't see why we'd require it.
Quoted 15 lines
- Moved
wm_levelvar to have more local scope (Ville Syrjälä)
- Renamed yuv tocolor_plane(Ville Syrjälä)inskl_plane_wm_levelSigned-off-by Stanislav Lisovskiy <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 120 +++++++++++++++++++++----------- 1 file changed, 81 insertions(+), 39 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c icl_get_total_relative_data_rate(struct intel_crtc_state *crtc_state, · line 4553
Quoted 6 lines
drivers/gpu/drm/i915/intel_pm.c +3
-0@@ -4548,6 +4548,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(struct intel_plane *plane, + const struct intel_crtc_state *crtc_state,
nit: I'd put the crtc_state as the first parameter as that's the thing we're operating on. The other stuff just specifies which piece we want to dig out.
Quoted 29 lines
drivers/gpu/drm/i915/intel_pm.c +10
-4+ int level, + int color_plane) +{ +const struct skl_plane_wm *wm = + &crtc_state->wm.skl.optimal.planes[plane->id]; + +return color_plane ? &wm->uv_wm[level] : &wm->wm[level]; +} +static int skl_allocate_pipe_ddb (struct intel_crtc_state *crtc_state) {@@ -4560,7 +4572,7 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)u16 total[I915_MAX_PLANES ] = {};u16 uv_total[I915_MAX_PLANES ] = {};u64 total_data_rate; -enum plane_id plane_id; +struct intel_plane *plane;int num_active;u64 plane_data_rate[I915_MAX_PLANES ] = {};u64 uv_plane_data_rate[I915_MAX_PLANES ] = {};@@ -4612,22 +4624,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 (intel_crtc, plane_id) { -const struct skl_plane_wm *wm = - &crtc_state->wm.skl.optimal.planes[plane_id];
drivers/gpu/drm/i915/intel_pm.c skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state) · line 4635
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +8
-2-if (plane_id ==PLANE_CURSOR ) { -if (wm->wm[level].min_ddb_alloc > total[PLANE_CURSOR ]) { +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) { +const struct skl_wm_level *wm_level; +const struct skl_wm_level *wm_uv_level; + + wm_level =skl_plane_wm_level (plane, crtc_state, + level, false); + wm_uv_level =skl_plane_wm_level (plane, crtc_state, + level, true);
false/true aren't particularly sensible color plane indices.
Quoted 175 lines
drivers/gpu/drm/i915/intel_pm.c +52
-31+ +if (plane->id ==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) {@@ -4649,13 +4667,18 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)* watermark level, plus an extra share of the leftover blocks * proportional to its relative data rate. */ -for_each_plane_id_on_crtc (intel_crtc, plane_id) { -const struct skl_plane_wm *wm = - &crtc_state->wm.skl.optimal.planes[plane_id]; +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) { +const struct skl_wm_level *wm_level; +const struct skl_wm_level *wm_uv_level;u64 rate;u16 extra; -if (plane_id ==PLANE_CURSOR ) + wm_level =skl_plane_wm_level (plane, crtc_state, + level, false); + wm_uv_level =skl_plane_wm_level (plane, crtc_state, + level, true); + +if (plane->id ==PLANE_CURSOR )continue ;/* @@ -4665,22 +4688,22 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)if (total_data_rate ==0 )break ; - rate = plane_data_rate[plane_id]; + rate = plane_data_rate[plane->id]; 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;if (total_data_rate ==0 )break ; - rate = uv_plane_data_rate[plane_id]; + rate = uv_plane_data_rate[plane->id]; 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; }@@ -4688,29 +4711,29 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)/* Set the actual DDB start/end points for each plane */ start = alloc->start; -for_each_plane_id_on_crtc (intel_crtc, plane_id) { +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) {struct skl_ddb_entry *plane_alloc = - &crtc_state->wm.skl.plane_ddb_y[plane_id]; + &crtc_state->wm.skl.plane_ddb_y[plane->id];struct skl_ddb_entry *uv_plane_alloc = - &crtc_state->wm.skl.plane_ddb_uv[plane_id]; + &crtc_state->wm.skl.plane_ddb_uv[plane->id]; -if (plane_id ==PLANE_CURSOR ) +if (plane->id ==PLANE_CURSOR )continue ;/* Gen11+ uses a separate plane for UV watermarks */ drm_WARN_ON (&dev_priv->drm, -INTEL_GEN (dev_priv) >=11 && uv_total[plane_id]); +INTEL_GEN (dev_priv) >=11 && uv_total[plane->id]);/* Leave disabled planes at (0,0) */ -if (total[plane_id]) { +if (total[plane->id]) { plane_alloc->start = start; - start += total[plane_id]; + start += total[plane->id]; plane_alloc->end = start; } -if (uv_total[plane_id]) { +if (uv_total[plane->id]) { uv_plane_alloc->start = start; - start += uv_total[plane_id]; + start += uv_total[plane->id]; uv_plane_alloc->end = start; } }@@ -4722,9 +4745,16 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)* that aren't actually possible. */ for (level++; level <=ilk_wm_max_level (dev_priv); level++) { -for_each_plane_id_on_crtc (intel_crtc, plane_id) { +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) { +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]; + &crtc_state->wm.skl.optimal.planes[plane->id]; + + wm_level =skl_plane_wm_level (plane, crtc_state, + level, false); + wm_uv_level =skl_plane_wm_level (plane, crtc_state, + level, true);/* * We only disable the watermarks for each plane if @@ -4738,9 +4768,10 @@ 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 (struct skl_wm_level ));/* * Wa_1408961008:icl, ehl @@ -4748,9 +4779,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 (plane, crtc_state, +0 , false); + 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; } } }@@ -4759,11 +4795,11 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)* Go back and disable the transition watermark if it turns out we * don't have enough DDB blocks for it. */ -for_each_plane_id_on_crtc (intel_crtc, plane_id) { +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) {struct skl_plane_wm *wm = - &crtc_state->wm.skl.optimal.planes[plane_id]; + &crtc_state->wm.skl.optimal.planes[plane->id]; -if (wm->trans_wm.plane_res_b >= total[plane_id]) +if (wm->trans_wm.plane_res_b >= total[plane->id])memset (&wm->trans_wm,0 ,sizeof (wm->trans_wm)); }
drivers/gpu/drm/i915/intel_pm.c void skl_write_plane_wm(struct intel_plane *plane, · line 5393
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -5354,10 +5390,13 @@ void skl_write_plane_wm(struct intel_plane *plane, &crtc_state->wm.skl.plane_ddb_y[plane_id];const struct skl_ddb_entry *ddb_uv = &crtc_state->wm.skl.plane_ddb_uv[plane_id]; +const struct skl_wm_level *wm_level;
These can be in tighter scope.
Quoted 27 lines
drivers/gpu/drm/i915/intel_pm.c +7
-2for (level =0 ; level <= max_level; level++) { + wm_level =skl_plane_wm_level (plane, crtc_state, level, false); +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);@@ -5388,10 +5427,13 @@ void skl_write_cursor_wm(struct intel_plane *plane, &crtc_state->wm.skl.optimal.planes[plane_id];const struct skl_ddb_entry *ddb = &crtc_state->wm.skl.plane_ddb_y[plane_id]; +const struct skl_wm_level *wm_level;for (level =0 ; level <= max_level; level++) { + wm_level =skl_plane_wm_level (plane, crtc_state, level, false); +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 · 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
Re: [Intel-gfx] [PATCH v18 2/8] drm/i915: Introduce skl_plane_wm_level accessor.
Quoted 5 lines
Quoted 1 line
v2: -
plane_id->plane->id(Ville Syrjälä)When did I say that? Can't find a previous review of this patch. Anywyas, that change seems to cause a lot of needless noise into the patch, and atm I can't see why we'd require it.
Your comment was in https://patchwork.freedesktop.org/patch/345025/?series=68028&rev=14,
however I seem to have wrongly interpreted it. I think my motivation to switch
to plane based iteration was because its way easier to call skl_plane_wm_level
function then, because it takes plane itself as a parameter, also as it had already
an id, thought it is also better that way, rather than keeping one more variable
instead. Whatever.. I'm fine with both, that is not critical anyways.
Stan
________________________________
From: Ville Syrjälä <[email protected]>
Sent: Thursday, February 27, 2020 5:51:52 PM
To: Lisovskiy, Stanislav
Cc: [email protected]; Ausmus, James; Saarinen, Jani; Roper, Matthew D
Subject: Re: [PATCH v18 2/8] drm/i915: Introduce skl_plane_wm_level accessor.
Quoted 4 lines · Stanislav Lisovskiy
For future Gen12 SAGV implementation we need to
seemlessly alter wm levels calculated, depending
on whether we are allowed to enable SAGV or not.
Quoted 8 lines
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ä)
When did I say that? Can't find a previous review of this patch. Anywyas, that change seems to cause a lot of needless noise into the patch, and atm I can't see why we'd require it.
Quoted 15 lines
- Moved
wm_levelvar to have more local scope (Ville Syrjälä)
- Renamed yuv tocolor_plane(Ville Syrjälä)inskl_plane_wm_levelSigned-off-by Stanislav Lisovskiy <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 120 +++++++++++++++++++++----------- 1 file changed, 81 insertions(+), 39 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c icl_get_total_relative_data_rate(struct intel_crtc_state *crtc_state, · line 4553
Quoted 6 lines
drivers/gpu/drm/i915/intel_pm.c +3
-0@@ -4548,6 +4548,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(struct intel_plane *plane, + const struct intel_crtc_state *crtc_state,
nit: I'd put the crtc_state as the first parameter as that's the thing we're operating on. The other stuff just specifies which piece we want to dig out.
Quoted 29 lines
drivers/gpu/drm/i915/intel_pm.c +10
-4+ int level, + int color_plane) +{ +const struct skl_plane_wm *wm = + &crtc_state->wm.skl.optimal.planes[plane->id]; + +return color_plane ? &wm->uv_wm[level] : &wm->wm[level]; +} +static int skl_allocate_pipe_ddb (struct intel_crtc_state *crtc_state) {@@ -4560,7 +4572,7 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)u16 total[I915_MAX_PLANES ] = {};u16 uv_total[I915_MAX_PLANES ] = {};u64 total_data_rate; -enum plane_id plane_id; +struct intel_plane *plane;int num_active;u64 plane_data_rate[I915_MAX_PLANES ] = {};u64 uv_plane_data_rate[I915_MAX_PLANES ] = {};@@ -4612,22 +4624,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 (intel_crtc, plane_id) { -const struct skl_plane_wm *wm = - &crtc_state->wm.skl.optimal.planes[plane_id];
drivers/gpu/drm/i915/intel_pm.c skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state) · line 4635
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +8
-2-if (plane_id ==PLANE_CURSOR ) { -if (wm->wm[level].min_ddb_alloc > total[PLANE_CURSOR ]) { +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) { +const struct skl_wm_level *wm_level; +const struct skl_wm_level *wm_uv_level; + + wm_level =skl_plane_wm_level (plane, crtc_state, + level, false); + wm_uv_level =skl_plane_wm_level (plane, crtc_state, + level, true);
false/true aren't particularly sensible color plane indices.
Quoted 175 lines
drivers/gpu/drm/i915/intel_pm.c +52
-31+ +if (plane->id ==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) {@@ -4649,13 +4667,18 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)* watermark level, plus an extra share of the leftover blocks * proportional to its relative data rate. */ -for_each_plane_id_on_crtc (intel_crtc, plane_id) { -const struct skl_plane_wm *wm = - &crtc_state->wm.skl.optimal.planes[plane_id]; +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) { +const struct skl_wm_level *wm_level; +const struct skl_wm_level *wm_uv_level;u64 rate;u16 extra; -if (plane_id ==PLANE_CURSOR ) + wm_level =skl_plane_wm_level (plane, crtc_state, + level, false); + wm_uv_level =skl_plane_wm_level (plane, crtc_state, + level, true); + +if (plane->id ==PLANE_CURSOR )continue ;/* @@ -4665,22 +4688,22 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)if (total_data_rate ==0 )break ; - rate = plane_data_rate[plane_id]; + rate = plane_data_rate[plane->id]; 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;if (total_data_rate ==0 )break ; - rate = uv_plane_data_rate[plane_id]; + rate = uv_plane_data_rate[plane->id]; 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; }@@ -4688,29 +4711,29 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)/* Set the actual DDB start/end points for each plane */ start = alloc->start; -for_each_plane_id_on_crtc (intel_crtc, plane_id) { +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) {struct skl_ddb_entry *plane_alloc = - &crtc_state->wm.skl.plane_ddb_y[plane_id]; + &crtc_state->wm.skl.plane_ddb_y[plane->id];struct skl_ddb_entry *uv_plane_alloc = - &crtc_state->wm.skl.plane_ddb_uv[plane_id]; + &crtc_state->wm.skl.plane_ddb_uv[plane->id]; -if (plane_id ==PLANE_CURSOR ) +if (plane->id ==PLANE_CURSOR )continue ;/* Gen11+ uses a separate plane for UV watermarks */ drm_WARN_ON (&dev_priv->drm, -INTEL_GEN (dev_priv) >=11 && uv_total[plane_id]); +INTEL_GEN (dev_priv) >=11 && uv_total[plane->id]);/* Leave disabled planes at (0,0) */ -if (total[plane_id]) { +if (total[plane->id]) { plane_alloc->start = start; - start += total[plane_id]; + start += total[plane->id]; plane_alloc->end = start; } -if (uv_total[plane_id]) { +if (uv_total[plane->id]) { uv_plane_alloc->start = start; - start += uv_total[plane_id]; + start += uv_total[plane->id]; uv_plane_alloc->end = start; } }@@ -4722,9 +4745,16 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)* that aren't actually possible. */ for (level++; level <=ilk_wm_max_level (dev_priv); level++) { -for_each_plane_id_on_crtc (intel_crtc, plane_id) { +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) { +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]; + &crtc_state->wm.skl.optimal.planes[plane->id]; + + wm_level =skl_plane_wm_level (plane, crtc_state, + level, false); + wm_uv_level =skl_plane_wm_level (plane, crtc_state, + level, true);/* * We only disable the watermarks for each plane if @@ -4738,9 +4768,10 @@ 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 (struct skl_wm_level ));/* * Wa_1408961008:icl, ehl @@ -4748,9 +4779,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 (plane, crtc_state, +0 , false); + 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; } } }@@ -4759,11 +4795,11 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state)* Go back and disable the transition watermark if it turns out we * don't have enough DDB blocks for it. */ -for_each_plane_id_on_crtc (intel_crtc, plane_id) { +for_each_intel_plane_on_crtc (&dev_priv->drm, intel_crtc, plane) {struct skl_plane_wm *wm = - &crtc_state->wm.skl.optimal.planes[plane_id]; + &crtc_state->wm.skl.optimal.planes[plane->id]; -if (wm->trans_wm.plane_res_b >= total[plane_id]) +if (wm->trans_wm.plane_res_b >= total[plane->id])memset (&wm->trans_wm,0 ,sizeof (wm->trans_wm)); }
drivers/gpu/drm/i915/intel_pm.c void skl_write_plane_wm(struct intel_plane *plane, · line 5393
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -5354,10 +5390,13 @@ void skl_write_plane_wm(struct intel_plane *plane, &crtc_state->wm.skl.plane_ddb_y[plane_id];const struct skl_ddb_entry *ddb_uv = &crtc_state->wm.skl.plane_ddb_uv[plane_id]; +const struct skl_wm_level *wm_level;
These can be in tighter scope.
Quoted 26 lines
drivers/gpu/drm/i915/intel_pm.c +7
-3for (level =0 ; level <= max_level; level++) { + wm_level =skl_plane_wm_level (plane, crtc_state, level, false); +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);@@ -5388,10 +5427,13 @@ void skl_write_cursor_wm(struct intel_plane *plane, &crtc_state->wm.skl.optimal.planes[plane_id];const struct skl_ddb_entry *ddb = &crtc_state->wm.skl.plane_ddb_y[plane_id]; +const struct skl_wm_level *wm_level;for (level =0 ; level <= max_level; level++) { + wm_level =skl_plane_wm_level (plane, crtc_state, level, false); +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); --
Quoted 1 line
2.24.1.485.gad05a3d8e5
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v18 3/8 drm/i915: Add intel_bw_get_*_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.
--- drivers/gpu/drm/i915/display/intel_bw.c | 33 ++++++++++++++++++++++--- drivers/gpu/drm/i915/display/intel_bw.h | 9 +++++++ 2 files changed, 39 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.c +30 -3
@@ -374,8 +374,35 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv,return data_rate; } -static struct intel_bw_state * -intel_atomic_get_bw_state (struct intel_atomic_state *state) +struct intel_bw_state * +intel_bw_get_old_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); +if (IS_ERR (bw_state)) +return ERR_CAST (bw_state); + +return to_intel_bw_state (bw_state); +} + +struct intel_bw_state * +intel_bw_get_new_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); + +if (IS_ERR (bw_state)) +return ERR_CAST (bw_state); + +return to_intel_bw_state (bw_state); +} + +struct intel_bw_state * +intel_bw_get_state (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_global_state *bw_state;
@@ -420,7 +447,7 @@ 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); + bw_state =intel_bw_get_state (state);if (IS_ERR (bw_state))return PTR_ERR (bw_state);
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_bw_get_old_state (struct intel_atomic_state *state); + +struct intel_bw_state * +intel_bw_get_new_state (struct intel_atomic_state *state); + +struct intel_bw_state * +intel_bw_get_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
Re: [Intel-gfx] [PATCH v18 3/8] drm/i915: Add intel_bw_get_*_state helpers
Quoted 6 lines · Stanislav Lisovskiy
Add 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_* inintel_bw.cfile.
And now they no longer match the naming pattern used by all the other simialr functions.
Quoted 80 lines
Signed-off-by Stanislav Lisovskiy <[email protected]>--- drivers/gpu/drm/i915/display/intel_bw.c | 33 ++++++++++++++++++++++--- drivers/gpu/drm/i915/display/intel_bw.h | 9 +++++++ 2 files changed, 39 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/display/intel_bw.c +30
-3@@ -374,8 +374,35 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv,return data_rate; } -static struct intel_bw_state * -intel_atomic_get_bw_state (struct intel_atomic_state *state) +struct intel_bw_state * +intel_bw_get_old_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); +if (IS_ERR (bw_state)) +return ERR_CAST (bw_state); + +return to_intel_bw_state (bw_state); +} + +struct intel_bw_state * +intel_bw_get_new_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); + +if (IS_ERR (bw_state)) +return ERR_CAST (bw_state); + +return to_intel_bw_state (bw_state); +} + +struct intel_bw_state * +intel_bw_get_state (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_global_state *bw_state;@@ -420,7 +447,7 @@ 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); + bw_state =intel_bw_get_state (state);if (IS_ERR (bw_state))return PTR_ERR (bw_state);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_bw_get_old_state (struct intel_atomic_state *state); + +struct intel_bw_state * +intel_bw_get_new_state (struct intel_atomic_state *state); + +struct intel_bw_state * +intel_bw_get_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 · 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 v18 4/8 drm/i915: Introduce more *_state_changed indicators
In reply to Stanislav LisovskiyThe reasoning behind this is such that current dependencies in the code are rather implicit in a sense, we have to constantly check a bunch of different bits like state->modeset, state->active_pipe_changes, which sometimes can indicate counter intuitive changes.
By introducing more fine grained state change tracking we achieve better readability and dependency maintenance for the code.
For example it is no longer needed to evaluate active_pipe_changes to understand if there were changes for wm/ddb - lets just have a correspondent bit in a state, called ddb_state_changed.
active_pipe_changes just indicate whether there was some pipe added or removed. Then we evaluate if wm/ddb had been changed. Same for sagv/bw state. ddb changes may or may not affect if out bandwidth constraints have been changed.
--- drivers/gpu/drm/i915/display/intel_atomic.c | 2 ++ drivers/gpu/drm/i915/display/intel_bw.c | 2 ++ drivers/gpu/drm/i915/display/intel_display.c | 16 ++++++---- .../drm/i915/display/intel_display_types.h | 32 ++++++++++++------- drivers/gpu/drm/i915/intel_pm.c | 4 ++- 5 files changed, 38 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +2 -0
@@ -525,6 +525,8 @@ void intel_atomic_state_clear(struct drm_atomic_state *s) state->dpll_set = state->modeset = false; state->global_state_changed = false; state->active_pipes =0 ; + state->ddb_state_changed = false; + state->bw_state_changed = false; } struct intel_crtc_state *
drivers/gpu/drm/i915/display/intel_bw.c +2 -0
@@ -468,6 +468,8 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)if (ret)return ret; + state->bw_state_changed = true; + data_rate =intel_bw_data_rate (dev_priv, bw_state); num_active_planes =intel_bw_num_active_planes (dev_priv, bw_state);
drivers/gpu/drm/i915/display/intel_display.c +10 -6
@@ -15509,8 +15509,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *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); +if (state->bw_state_changed) { +if (!intel_can_enable_sagv (state)) +intel_disable_sagv (dev_priv); + }intel_modeset_verify_disabled (dev_priv, state); }
@@ -15534,7 +15536,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_encoders_update_prepare (state);/* Enable all new slices, we might need */ -if (state->modeset) +if (state->ddb_state_changed)icl_dbuf_slice_pre_update (state);/* Now enable the clocks, plane, pipe, and connectors that we set up. */
@@ -15591,7 +15593,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) }/* Disable all slices, we don't need */ -if (state->modeset) +if (state->ddb_state_changed)icl_dbuf_slice_post_update (state);for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {
@@ -15610,8 +15612,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)if (state->modeset)intel_verify_planes (state); -if (state->modeset &&intel_can_enable_sagv (state)) -intel_enable_sagv (dev_priv); +if (state->bw_state_changed) { + if (intel_can_enable_sagv(state) +intel_enable_sagv (dev_priv); + }drm_atomic_helper_commit_hw_done (&state->base);
drivers/gpu/drm/i915/display/intel_display_types.h +21 -11
@@ -471,16 +471,6 @@ struct intel_atomic_state {bool dpll_set, modeset; -/* -* Does this transaction change the pipes that are active? This mask -* tracks which CRTC's have changed their active state at the end of -* the transaction (not counting the temporary disable during modesets). -* This mask should only be non-zero when intel_state->modeset is true, -* but the converse is not necessarily true; simply changing a mode may -* not flip the final active status of any CRTC's -*/ -u8 active_pipe_changes; -u8 active_pipes;struct intel_shared_dpll_state shared_dpll[I915_NUM_PLLS ];
@@ -494,10 +484,30 @@ struct intel_atomic_state {bool rps_interactive;/* -* active_pipes +* active pipes */ bool global_state_changed; +/* +* Does this transaction change the pipes that are active? This mask +* tracks which CRTC's have changed their active state at the end of +* the transaction (not counting the temporary disable during modesets). +* This mask should only be non-zero when intel_state->modeset is true, +* but the converse is not necessarily true; simply changing a mode may +* not flip the final active status of any CRTC's +*/ +u8 active_pipe_changes; + +/* +* More granular change indicator for ddb changes +*/ +bool ddb_state_changed; + +/* +* More granular change indicator for bandwidth state changes +*/ +bool bw_state_changed; +/* Number of enabled DBuf slices */ u8 enabled_dbuf_slices_mask;
drivers/gpu/drm/i915/intel_pm.c +3 -1
@@ -3894,7 +3894,7 @@ skl_ddb_get_pipe_allocation_limits(struct drm_i915_private *dev_priv,* that changes the active CRTC list or do modeset would need to * grab _all_ crtc locks, including the one we currently hold. */ -if (!intel_state->active_pipe_changes && !intel_state->modeset) { +if (!intel_state->ddb_state_changed) {/* * alloc may be cleared by clear_intel_crtc_state, * copy from old state to be sure
@@ -5787,6 +5787,8 @@ static int skl_wm_add_affected_planes(struct intel_atomic_state *state,return PTR_ERR (plane_state); new_crtc_state->update_planes |=BIT (plane_id); + + state->ddb_state_changed = true; }return 0 ;
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v18 4/8 drm/i915: Introduce more *_state_changed indicators
The reasoning behind this is such that current dependencies in the code are rather implicit in a sense, we have to constantly check a bunch of different bits like state->modeset, state->active_pipe_changes, which sometimes can indicate counter intuitive changes.
By introducing more fine grained state change tracking we achieve better readability and dependency maintenance for the code.
For example it is no longer needed to evaluate active_pipe_changes to understand if there were changes for wm/ddb - lets just have a correspondent bit in a state, called ddb_state_changed.
active_pipe_changes just indicate whether there was some pipe added or removed. Then we evaluate if wm/ddb had been changed. Same for sagv/bw state. ddb changes may or may not affect if out bandwidth constraints have been changed.
v2: Add support for older Gens in order not to introduce regressions
--- drivers/gpu/drm/i915/display/intel_atomic.c | 2 ++ drivers/gpu/drm/i915/display/intel_bw.c | 28 ++++++++++++++-- drivers/gpu/drm/i915/display/intel_display.c | 16 ++++++---- .../drm/i915/display/intel_display_types.h | 32 ++++++++++++------- drivers/gpu/drm/i915/intel_pm.c | 5 ++- 5 files changed, 62 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +2 -0
@@ -525,6 +525,8 @@ void intel_atomic_state_clear(struct drm_atomic_state *s) state->dpll_set = state->modeset = false; state->global_state_changed = false; state->active_pipes =0 ; + state->ddb_state_changed = false; + state->bw_state_changed = false; } struct intel_crtc_state *
drivers/gpu/drm/i915/display/intel_bw.c +25 -3
@@ -424,9 +424,27 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)struct intel_crtc *crtc;int i, ret; -/* FIXME earlier gens need some checks too */ -if (INTEL_GEN (dev_priv) <11 ) +/* +* For earlier Gens let's consider bandwidth changed if ddb requirements, +* has been changed. +*/ +if (INTEL_GEN (dev_priv) <11 ) { +if (state->ddb_state_changed) { + bw_state =intel_bw_get_state (state); +if (IS_ERR (bw_state)) +return PTR_ERR (bw_state); + + ret =intel_atomic_lock_global_state (&bw_state->base); +if (ret) +return ret; + +DRM_DEBUG_KMS ("Marking bw state changed for atomic state %p\n" , + state); + + state->bw_state_changed = true; + }return 0 ; + }for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {
@@ -447,7 +465,7 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) old_active_planes == new_active_planes)continue ; - bw_state =intel_bw_get_state (state); + bw_state =intel_bw_get_state (state);if (IS_ERR (bw_state))return PTR_ERR (bw_state);
@@ -468,6 +486,10 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)if (ret)return ret; +DRM_DEBUG_KMS ("Marking bw state changed for atomic state %p\n" , state); + + state->bw_state_changed = true; + data_rate =intel_bw_data_rate (dev_priv, bw_state); num_active_planes =intel_bw_num_active_planes (dev_priv, bw_state);
drivers/gpu/drm/i915/display/intel_display.c +10 -6
@@ -15540,8 +15540,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *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); +if (state->bw_state_changed) { +if (!intel_can_enable_sagv (state)) +intel_disable_sagv (dev_priv); + }intel_modeset_verify_disabled (dev_priv, state); }
@@ -15565,7 +15567,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_encoders_update_prepare (state);/* Enable all new slices, we might need */ -if (state->modeset) +if (state->ddb_state_changed)icl_dbuf_slice_pre_update (state);/* Now enable the clocks, plane, pipe, and connectors that we set up. */
@@ -15622,7 +15624,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) }/* Disable all slices, we don't need */ -if (state->modeset) +if (state->ddb_state_changed)icl_dbuf_slice_post_update (state);for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {
@@ -15641,8 +15643,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)if (state->modeset)intel_verify_planes (state); -if (state->modeset &&intel_can_enable_sagv (state)) -intel_enable_sagv (dev_priv); +if (state->bw_state_changed) { + if (intel_can_enable_sagv(state) +intel_enable_sagv (dev_priv); + }drm_atomic_helper_commit_hw_done (&state->base);
drivers/gpu/drm/i915/display/intel_display_types.h +21 -11
@@ -471,16 +471,6 @@ struct intel_atomic_state {bool dpll_set, modeset; -/* -* Does this transaction change the pipes that are active? This mask -* tracks which CRTC's have changed their active state at the end of -* the transaction (not counting the temporary disable during modesets). -* This mask should only be non-zero when intel_state->modeset is true, -* but the converse is not necessarily true; simply changing a mode may -* not flip the final active status of any CRTC's -*/ -u8 active_pipe_changes; -u8 active_pipes;struct intel_shared_dpll_state shared_dpll[I915_NUM_PLLS ];
@@ -494,10 +484,30 @@ struct intel_atomic_state {bool rps_interactive;/* -* active_pipes +* active pipes */ bool global_state_changed; +/* +* Does this transaction change the pipes that are active? This mask +* tracks which CRTC's have changed their active state at the end of +* the transaction (not counting the temporary disable during modesets). +* This mask should only be non-zero when intel_state->modeset is true, +* but the converse is not necessarily true; simply changing a mode may +* not flip the final active status of any CRTC's +*/ +u8 active_pipe_changes; + +/* +* More granular change indicator for ddb changes +*/ +bool ddb_state_changed; + +/* +* More granular change indicator for bandwidth state changes +*/ +bool bw_state_changed; +/* Number of enabled DBuf slices */ u8 enabled_dbuf_slices_mask;
drivers/gpu/drm/i915/intel_pm.c +4 -1
@@ -3894,7 +3894,7 @@ skl_ddb_get_pipe_allocation_limits(struct drm_i915_private *dev_priv,* that changes the active CRTC list or do modeset would need to * grab _all_ crtc locks, including the one we currently hold. */ -if (!intel_state->active_pipe_changes && !intel_state->modeset) { +if (!intel_state->ddb_state_changed) {/* * alloc may be cleared by clear_intel_crtc_state, * copy from old state to be sure
@@ -5787,6 +5787,9 @@ static int skl_wm_add_affected_planes(struct intel_atomic_state *state,return PTR_ERR (plane_state); new_crtc_state->update_planes |=BIT (plane_id); + +DRM_DEBUG_KMS ("Marking ddb state changed for atomic state %p\n" , state); + state->ddb_state_changed = true; }return 0 ;
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 v18 4/8] drm/i915: Introduce more *_state_changed indicators
Quoted 34 lines · Stanislav Lisovskiy
The reasoning behind this is such that current dependencies in the code are rather implicit in a sense, we have to constantly check a bunch of different bits like
state->modeset,state->active_pipe_changes, which sometimes can indicate counter intuitive changes.By introducing more fine grained state change tracking we achieve better readability and dependency maintenance for the code.
For example it is no longer needed to evaluate
active_pipe_changesto understand if there were changes for wm/ddb - lets just have a correspondent bit in a state, calledddb_state_changed.
active_pipe_changesjust indicate whether there was some pipe added or removed. Then we evaluate if wm/ddb had been changed. Same for sagv/bw state. ddb changes may or may not affect if out bandwidth constraints have been changed.v2: Add support for older Gens in order not to introduce regressions
Signed-off-by Stanislav Lisovskiy <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 2 ++ drivers/gpu/drm/i915/display/intel_bw.c | 28 ++++++++++++++-- drivers/gpu/drm/i915/display/intel_display.c | 16 ++++++---- .../drm/i915/display/intel_display_types.h | 32 ++++++++++++------- drivers/gpu/drm/i915/intel_pm.c | 5 ++- 5 files changed, 62 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +0
-0
drivers/gpu/drm/i915/display/intel_atomic.c void intel_atomic_state_clear(struct drm_atomic_state *s) · line 529
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_atomic.c +2
-0@@ -525,6 +525,8 @@ void intel_atomic_state_clear(struct drm_atomic_state *s) state->dpll_set = state->modeset = false; state->global_state_changed = false; state->active_pipes =0 ; + state->ddb_state_changed = false; + state->bw_state_changed = false;
Not really liking these.
After some pondering I was thinking along the lines of something simple like this:
struct bw_state {
u8 sagv_reject;
};bw_check()
{
for_each_crtc_in_state() {
if (sagv_possible(crtc_state))
new->sagv_reject &= ~BIT(pipe);
else
new->sagv_reject |= BIT(pipe);
}
calculate new->qgv_mask
}Quoted 183 lines
drivers/gpu/drm/i915/display/intel_atomic.c +0
-0} struct intel_crtc_state *drivers/gpu/drm/i915/display/intel_bw.c +25
-3@@ -424,9 +424,27 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)struct intel_crtc *crtc;int i, ret; -/* FIXME earlier gens need some checks too */ -if (INTEL_GEN (dev_priv) <11 ) +/* +* For earlier Gens let's consider bandwidth changed if ddb requirements, +* has been changed. +*/ +if (INTEL_GEN (dev_priv) <11 ) { +if (state->ddb_state_changed) { + bw_state =intel_bw_get_state (state); +if (IS_ERR (bw_state)) +return PTR_ERR (bw_state); + + ret =intel_atomic_lock_global_state (&bw_state->base); +if (ret) +return ret; + +DRM_DEBUG_KMS ("Marking bw state changed for atomic state %p\n" , + state); + + state->bw_state_changed = true; + }return 0 ; + }for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {@@ -447,7 +465,7 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) old_active_planes == new_active_planes)continue ; - bw_state =intel_bw_get_state (state); + bw_state =intel_bw_get_state (state);if (IS_ERR (bw_state))return PTR_ERR (bw_state);@@ -468,6 +486,10 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)if (ret)return ret; +DRM_DEBUG_KMS ("Marking bw state changed for atomic state %p\n" , state); + + state->bw_state_changed = true; + data_rate =intel_bw_data_rate (dev_priv, bw_state); num_active_planes =intel_bw_num_active_planes (dev_priv, bw_state);drivers/gpu/drm/i915/display/intel_display.c +10
-6@@ -15540,8 +15540,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *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); +if (state->bw_state_changed) { +if (!intel_can_enable_sagv (state)) +intel_disable_sagv (dev_priv); + }intel_modeset_verify_disabled (dev_priv, state); }@@ -15565,7 +15567,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_encoders_update_prepare (state);/* Enable all new slices, we might need */ -if (state->modeset) +if (state->ddb_state_changed)icl_dbuf_slice_pre_update (state);/* Now enable the clocks, plane, pipe, and connectors that we set up. */ @@ -15622,7 +15624,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) }/* Disable all slices, we don't need */ -if (state->modeset) +if (state->ddb_state_changed)icl_dbuf_slice_post_update (state);for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {@@ -15641,8 +15643,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)if (state->modeset)intel_verify_planes (state); -if (state->modeset &&intel_can_enable_sagv (state)) -intel_enable_sagv (dev_priv); +if (state->bw_state_changed) { + if (intel_can_enable_sagv(state) +intel_enable_sagv (dev_priv); + }drm_atomic_helper_commit_hw_done (&state->base);drivers/gpu/drm/i915/display/intel_display_types.h +21
-11@@ -471,16 +471,6 @@ struct intel_atomic_state {bool dpll_set, modeset; -/* -* Does this transaction change the pipes that are active? This mask -* tracks which CRTC's have changed their active state at the end of -* the transaction (not counting the temporary disable during modesets). -* This mask should only be non-zero when intel_state->modeset is true, -* but the converse is not necessarily true; simply changing a mode may -* not flip the final active status of any CRTC's -*/ -u8 active_pipe_changes; -u8 active_pipes;struct intel_shared_dpll_state shared_dpll[I915_NUM_PLLS ];@@ -494,10 +484,30 @@ struct intel_atomic_state {bool rps_interactive;/* -* active_pipes +* active pipes */ bool global_state_changed; +/* +* Does this transaction change the pipes that are active? This mask +* tracks which CRTC's have changed their active state at the end of +* the transaction (not counting the temporary disable during modesets). +* This mask should only be non-zero when intel_state->modeset is true, +* but the converse is not necessarily true; simply changing a mode may +* not flip the final active status of any CRTC's +*/ +u8 active_pipe_changes; + +/* +* More granular change indicator for ddb changes +*/ +bool ddb_state_changed; + +/* +* More granular change indicator for bandwidth state changes +*/ +bool bw_state_changed; +/* Number of enabled DBuf slices */ u8 enabled_dbuf_slices_mask;drivers/gpu/drm/i915/intel_pm.c +4
-1@@ -3894,7 +3894,7 @@ skl_ddb_get_pipe_allocation_limits(struct drm_i915_private *dev_priv,* that changes the active CRTC list or do modeset would need to * grab _all_ crtc locks, including the one we currently hold. */ -if (!intel_state->active_pipe_changes && !intel_state->modeset) { +if (!intel_state->ddb_state_changed) {/* * alloc may be cleared by clear_intel_crtc_state, * copy from old state to be sure @@ -5787,6 +5787,9 @@ static int skl_wm_add_affected_planes(struct intel_atomic_state *state,return PTR_ERR (plane_state); new_crtc_state->update_planes |=BIT (plane_id); + +DRM_DEBUG_KMS ("Marking ddb state changed for atomic state %p\n" , state); + state->ddb_state_changed = true; }return 0 ;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
Re: [Intel-gfx] [PATCH v18 4/8] drm/i915: Introduce more *_state_changed indicators
Quoted 57 lines · Ville Syrjälä
Quoted 38 lines · Stanislav Lisovskiy
The reasoning behind this is such that current dependencies in the code are rather implicit in a sense, we have to constantly check a bunch of different bits like
state->modeset,state->active_pipe_changes, which sometimes can indicate counter intuitive changes.By introducing more fine grained state change tracking we achieve better readability and dependency maintenance for the code.
For example it is no longer needed to evaluate
active_pipe_changesto understand if there were changes for wm/ddb - lets just have a correspondent bit in a state, calledddb_state_changed.
active_pipe_changesjust indicate whether there was some pipe added or removed. Then we evaluate if wm/ddb had been changed. Same for sagv/bw state. ddb changes may or may not affect if out bandwidth constraints have been changed.v2: Add support for older Gens in order not to introduce regressions
Signed-off-by Stanislav Lisovskiy <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 2 ++ drivers/gpu/drm/i915/display/intel_bw.c | 28 ++++++++++++++-(quoted diff) +0
-2- drivers/gpu/drm/i915/display/intel_display.c | 16 ++++++---- .../drm/i915/display/intel_display_types.h | 32 ++++++++++++--- ---- drivers/gpu/drm/i915/intel_pm.c | 5 ++- 5 files changed, 62 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +0
-0drivers/gpu/drm/i915/display/intel_atomic.c void intel_atomic_state_clear(struct · line 530
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_atomic.c +2
-0@@ -525,6 +525,8 @@ void intel_atomic_state_clear(struct drm_atomic_state *s) state->dpll_set = state->modeset = false; state->global_state_changed = false; state->active_pipes =0 ; + state->ddb_state_changed = false; + state->bw_state_changed = false;Not really liking these.
After some pondering I was thinking along the lines of something simple
like this:struct bw_state { u8 sagv_reject; };
bw_check()
Quoted 10 lines
{
for_each_crtc_in_state() {
if (sagv_possible(crtc_state))
new->sagv_reject &= ~BIT(pipe);
else
new->sagv_reject |= BIT(pipe);
}
calculate new->qgv_mask
}This is exactly what's done in the next patch, except that I store pipe, which are allowed to have SAGV, i.e:
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_mask;
+
+ /*
+ * Used to determine if we already had calculated
+ * SAGV mask for this state once.
+ */
+ bool sagv_calculated;
+
+ /*
+ * Contains final SAGV decision based on current mask,
+ * to prevent doing the same job over and over again.
+ */
+ bool can_sagv;
+
Also the mask is calculated almost exactly same way:
static void icl_compute_sagv_mask(struct intel_atomic_state *state) +{
+ struct intel_crtc *crtc;
+ struct intel_crtc_state *new_crtc_state;
+ int i;
+ struct intel_bw_state *new_bw_state =intel_bw_get_state(state);
+
+ if (IS_ERR(new_bw_state)) {
+ WARN(1, "Could not get bw_state\n");
+ return;
+ }
+
+ for_each_new_intel_crtc_in_state(state, crtc,
+ new_crtc_state, i) {
+ if (skl_can_enable_sagv_on_pipe(state, crtc->pipe))
+ new_bw_state->pipe_sagv_mask |= BIT(crtc-
Quoted 1 line
pipe);
+ else
+ new_bw_state->pipe_sagv_mask &= ~BIT(crtc-
Quoted 1 line
pipe);
+ }
+}
But this patch is not about that - it is about how we signal/determine that some change has to be written at commit stage.
As you remember when we were discussed offline, I just wanted to have some expicit way to mark if some global state subsystem had changed, without having to do any additional checks, because imho all the checks we should do during atomic check, while commit simply applies what has to be applied.
If you are really against having those boolean or any other way to be able so simply mark some stage object "dirty" (just like mem pages analogy) then would vote at least to have some helper functions to do that.
i.e smth like:
bool pipe_sagv_mask_changed(..)
bool ddb_state_changed(...)
Stan
Quoted 216 lines
Quoted 216 lines
drivers/gpu/drm/i915/display/intel_atomic.c +0
-0}struct
intel_crtc_state*drivers/gpu/drm/i915/display/intel_bw.c +20
-2@@ -424,9 +424,27 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)struct intel_crtc *crtc;int i, ret; -/* FIXME earlier gens need some checks too */ -if (INTEL_GEN (dev_priv) <11 ) +/* +* For earlier Gens let's consider bandwidth changed if ddb requirements, +* has been changed. +*/ +if (INTEL_GEN (dev_priv) <11 ) { +if (state->ddb_state_changed) { + bw_state =intel_bw_get_state (state); +if (IS_ERR (bw_state)) +return PTR_ERR (bw_state); + + ret =intel_atomic_lock_global_state (&bw_state- >base); +if (ret) +return ret; + + DRM_DEBUG_KMS("Marking bw state changed for atomic state %p\n", + state); + + state->bw_state_changed = true; + }return 0 ; + } for_each_oldnew_intel_crtc_in_state(state, crtc,
old_crtc_state,drivers/gpu/drm/i915/display/intel_bw.c +5
-1new_crtc_state, i) {@@ -447,7 +465,7 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) old_active_planes == new_active_planes) continue; - bw_state =intel_bw_get_state (state); + bw_state =intel_bw_get_state (state);if (IS_ERR (bw_state))return PTR_ERR (bw_state);@@ -468,6 +486,10 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)if (ret)return ret; +DRM_DEBUG_KMS ("Marking bw state changed for atomic state %p\n" , state); + + state->bw_state_changed = true; + data_rate =intel_bw_data_rate (dev_priv, bw_state);
num_active_planes= intel_bw_num_active_planes(dev_priv,bw_state);drivers/gpu/drm/i915/display/intel_display.c +0
-0@@ -15540,8 +15540,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) * SKL workaround: bspec recommends we disable the SAGVwhen we
drivers/gpu/drm/i915/display/intel_display.c +5
-3* have more then one pipe enabled */ -if (!intel_can_enable_sagv (state)) -intel_disable_sagv (dev_priv); +if (state->bw_state_changed) { +if (!intel_can_enable_sagv (state)) +intel_disable_sagv (dev_priv); + }intel_modeset_verify_disabled (dev_priv, state); }@@ -15565,7 +15567,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_encoders_update_prepare (state );/* Enable all new slices, we might need */ -if (state->modeset) +if (state->ddb_state_changed)icl_dbuf_slice_pre_update (state);/* Now enable the clocks, plane, pipe, and connectors that we
set up. */drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -15622,7 +15624,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) }/* Disable all slices, we don't need */ -if (state->modeset) +if (state->ddb_state_changed)icl_dbuf_slice_post_update (state);for_each_oldnew_intel_crtc_in_state(state, crtc,
old_crtc_state,new_crtc_state, i) {drivers/gpu/drm/i915/display/intel_display.c +4
-2@@ -15641,8 +15643,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) if (state->modeset) intel_verify_planes(state); -if (state->modeset &&intel_can_enable_sagv (state)) -intel_enable_sagv (dev_priv); +if (state->bw_state_changed) { + if (intel_can_enable_sagv(state) +intel_enable_sagv (dev_priv); + }drm_atomic_helper_commit_hw_done (&state->base);drivers/gpu/drm/i915/display/intel_display_types.h +0
-2@@ -471,16 +471,6 @@ struct intel_atomic_state {bool dpll_set, modeset; -/* -* Does this transaction change the pipes that are active? This mask
drivers/gpu/drm/i915/display/intel_display_types.h +0
-1-* tracks which CRTC's have changed their active state at the end of
drivers/gpu/drm/i915/display/intel_display_types.h +0
-1-* the transaction (not counting the temporary disable during modesets).
drivers/gpu/drm/i915/display/intel_display_types.h +0
-1-* This mask should only be non-zero when intel_state->modeset is true,
drivers/gpu/drm/i915/display/intel_display_types.h +0
-1-* but the converse is not necessarily true; simply changing a mode may
drivers/gpu/drm/i915/display/intel_display_types.h +3
-5-* not flip the final active status of any CRTC's -*/ -u8 active_pipe_changes; -u8 active_pipes;struct intel_shared_dpll_state shared_dpll[I915_NUM_PLLS ];@@ -494,10 +484,30 @@ struct intel_atomic_state {bool rps_interactive;/* -* active_pipes +* active pipes */ bool global_state_changed; +/* +* Does this transaction change the pipes that are active? This mask
drivers/gpu/drm/i915/display/intel_display_types.h +1
-0+* tracks which CRTC's have changed their active state at the end of
drivers/gpu/drm/i915/display/intel_display_types.h +1
-0+* the transaction (not counting the temporary disable during modesets).
drivers/gpu/drm/i915/display/intel_display_types.h +1
-0+* This mask should only be non-zero when intel_state->modeset is true,
drivers/gpu/drm/i915/display/intel_display_types.h +1
-0+* but the converse is not necessarily true; simply changing a mode may
drivers/gpu/drm/i915/display/intel_display_types.h +14
-0+* not flip the final active status of any CRTC's +*/ +u8 active_pipe_changes; + +/* +* More granular change indicator for ddb changes +*/ +bool ddb_state_changed; + +/* +* More granular change indicator for bandwidth state changes +*/ +bool bw_state_changed; +/* Number of enabled DBuf slices */ u8 enabled_dbuf_slices_mask;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3894,7 +3894,7 @@ skl_ddb_get_pipe_allocation_limits(structdrm_i915_private *dev_priv, * that changes the active CRTC list or do modeset would needto
drivers/gpu/drm/i915/intel_pm.c +0
-1* grab _all_ crtc locks, including the one we currently hold. */ -if (!intel_state->active_pipe_changes && !intel_state->modeset){
drivers/gpu/drm/i915/intel_pm.c +4
-0+if (!intel_state->ddb_state_changed) {/* * alloc may be cleared by clear_intel_crtc_state, * copy from old state to be sure @@ -5787,6 +5787,9 @@ static int skl_wm_add_affected_planes(structintel_atomic_state *state, return PTR_ERR(plane_state); new_crtc_state->update_planes |=BIT (plane_id); + + DRM_DEBUG_KMS("Marking ddb state changed for atomic state %p\n", state); + state->ddb_state_changed = true; }
Quoted 5 lines
Quoted 3 lines
return 0;
Signature · 1 line
2.24.1.485.gad05a3d8e5
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v18 4/8] drm/i915: Introduce more *_state_changed indicators
Quoted 66 lines · Stanislav
Quoted 65 lines · Ville Syrjälä
Quoted 38 lines · Stanislav Lisovskiy
The reasoning behind this is such that current dependencies in the code are rather implicit in a sense, we have to constantly check a bunch of different bits like
state->modeset,state->active_pipe_changes, which sometimes can indicate counter intuitive changes.By introducing more fine grained state change tracking we achieve better readability and dependency maintenance for the code.
For example it is no longer needed to evaluate
active_pipe_changesto understand if there were changes for wm/ddb - lets just have a correspondent bit in a state, calledddb_state_changed.
active_pipe_changesjust indicate whether there was some pipe added or removed. Then we evaluate if wm/ddb had been changed. Same for sagv/bw state. ddb changes may or may not affect if out bandwidth constraints have been changed.v2: Add support for older Gens in order not to introduce regressions
Signed-off-by Stanislav Lisovskiy <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 2 ++ drivers/gpu/drm/i915/display/intel_bw.c | 28 ++++++++++++++-(quoted diff) +0
-2- drivers/gpu/drm/i915/display/intel_display.c | 16 ++++++---- .../drm/i915/display/intel_display_types.h | 32 ++++++++++++--- ---- drivers/gpu/drm/i915/intel_pm.c | 5 ++- 5 files changed, 62 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +0
-0drivers/gpu/drm/i915/display/intel_atomic.c void intel_atomic_state_clear(struct · line 530
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_atomic.c +2
-0@@ -525,6 +525,8 @@ void intel_atomic_state_clear(struct drm_atomic_state *s) state->dpll_set = state->modeset = false; state->global_state_changed = false; state->active_pipes =0 ; + state->ddb_state_changed = false; + state->bw_state_changed = false;Not really liking these.
After some pondering I was thinking along the lines of something simple
like this:struct bw_state { u8 sagv_reject; };
bw_check(){ for_each_crtc_in_state() { if (sagv_possible(crtc_state)) new->sagv_reject &= ~BIT(pipe); else new->sagv_reject |= BIT(pipe); }
Quoted 5 lines
Quoted 2 lines
calculate new->qgv_mask }This is exactly what's done in the next patch, except that I store pipe, which are allowed to have SAGV, i.e:
I think inverted mask idea leads to neater code because then we don't have to care which pipes are actually present in the hw and which are fused off/not present:
sagv_reject == 0 -> SAGV possiblesagv_reject != 0 -> SAGV not possible
Quoted 58 lines
struct
intel_bw_state{drivers/gpu/drm/i915/display/intel_bw.c +2
-0struct intel_global_state base; +/* +* Contains a bit mask, used to determine, whether correspondent
drivers/gpu/drm/i915/display/intel_display_types.h +16
-0+* pipe allows SAGV or not. +*/ +u8 pipe_sagv_mask; + +/* +* Used to determine if we already had calculated +* SAGV mask for this state once. +*/ +bool sagv_calculated; + +/* +* Contains final SAGV decision based on current mask, +* to prevent doing the same job over and over again. +*/ +bool can_sagv; +Also the mask is calculated almost exactly same way:
static void
icl_compute_sagv_mask(struct intel_atomic_state *state)(quoted diff) +5
-0+{ + struct intel_crtc *crtc; + struct intel_crtc_state *new_crtc_state; + int i; + struct intel_bw_state *new_bw_state =
intel_bw_get_state(state);(quoted diff) +10
-0+ + if (IS_ERR(new_bw_state)) { + WARN(1, "Could not get bw_state\n"); + return; + } + + for_each_new_intel_crtc_in_state(state, crtc, + new_crtc_state, i) { + if (skl_can_enable_sagv_on_pipe(state, crtc->pipe)) + new_bw_state->pipe_sagv_mask |= BIT(crtc-Quoted 1 line
pipe);
(quoted diff) +2
-0+ else + new_bw_state->pipe_sagv_mask &= ~BIT(crtc-Quoted 1 line
pipe);
drivers/gpu/drm/i915/display/intel_bw.c +2
-0+ } +}But this patch is not about that - it is about how we signal/determine that some change has to be written at commit stage.
As you remember when we were discussed offline, I just wanted to have some expicit way to mark if some global state subsystem had changed, without having to do any additional checks, because imho all the checks we should do during atomic check, while commit simply applies what has to be applied.
Quoted 7 lines
If you are really against having those boolean or any other way to be able so simply mark some stage object "dirty" (just like mem pages analogy) then would vote at least to have some helper functions to do that.
i.e smth like:bool
pipe_sagv_mask_changed(..)
This is just a !=, no? Don't see a function really making it any more clear.
Quoted 2 lines
bool
ddb_state_changed(...)
So far I don't see any real need to check for that.
Quoted 224 lines
Stan
Quoted 221 lines
Quoted 219 lines
drivers/gpu/drm/i915/display/intel_atomic.c +0
-0}struct
intel_crtc_state*drivers/gpu/drm/i915/display/intel_bw.c +20
-2@@ -424,9 +424,27 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)struct intel_crtc *crtc;int i, ret; -/* FIXME earlier gens need some checks too */ -if (INTEL_GEN (dev_priv) <11 ) +/* +* For earlier Gens let's consider bandwidth changed if ddb requirements, +* has been changed. +*/ +if (INTEL_GEN (dev_priv) <11 ) { +if (state->ddb_state_changed) { + bw_state =intel_bw_get_state (state); +if (IS_ERR (bw_state)) +return PTR_ERR (bw_state); + + ret =intel_atomic_lock_global_state (&bw_state- >base); +if (ret) +return ret; + + DRM_DEBUG_KMS("Marking bw state changed for atomic state %p\n", + state); + + state->bw_state_changed = true; + }return 0 ; + } for_each_oldnew_intel_crtc_in_state(state, crtc,
old_crtc_state,drivers/gpu/drm/i915/display/intel_bw.c +5
-1new_crtc_state, i) {@@ -447,7 +465,7 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) old_active_planes == new_active_planes) continue; - bw_state =intel_bw_get_state (state); + bw_state =intel_bw_get_state (state);if (IS_ERR (bw_state))return PTR_ERR (bw_state);@@ -468,6 +486,10 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)if (ret)return ret; +DRM_DEBUG_KMS ("Marking bw state changed for atomic state %p\n" , state); + + state->bw_state_changed = true; + data_rate =intel_bw_data_rate (dev_priv, bw_state);
num_active_planes= intel_bw_num_active_planes(dev_priv,bw_state);drivers/gpu/drm/i915/display/intel_display.c +0
-0@@ -15540,8 +15540,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) * SKL workaround: bspec recommends we disable the SAGVwhen we
drivers/gpu/drm/i915/display/intel_display.c +5
-3* have more then one pipe enabled */ -if (!intel_can_enable_sagv (state)) -intel_disable_sagv (dev_priv); +if (state->bw_state_changed) { +if (!intel_can_enable_sagv (state)) +intel_disable_sagv (dev_priv); + }intel_modeset_verify_disabled (dev_priv, state); }@@ -15565,7 +15567,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_encoders_update_prepare (state );/* Enable all new slices, we might need */ -if (state->modeset) +if (state->ddb_state_changed)icl_dbuf_slice_pre_update (state);/* Now enable the clocks, plane, pipe, and connectors that we
set up. */drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -15622,7 +15624,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) }/* Disable all slices, we don't need */ -if (state->modeset) +if (state->ddb_state_changed)icl_dbuf_slice_post_update (state);for_each_oldnew_intel_crtc_in_state(state, crtc,
old_crtc_state,new_crtc_state, i) {drivers/gpu/drm/i915/display/intel_display.c +4
-2@@ -15641,8 +15643,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) if (state->modeset) intel_verify_planes(state); -if (state->modeset &&intel_can_enable_sagv (state)) -intel_enable_sagv (dev_priv); +if (state->bw_state_changed) { + if (intel_can_enable_sagv(state) +intel_enable_sagv (dev_priv); + }drm_atomic_helper_commit_hw_done (&state->base);drivers/gpu/drm/i915/display/intel_display_types.h +0
-2@@ -471,16 +471,6 @@ struct intel_atomic_state {bool dpll_set, modeset; -/* -* Does this transaction change the pipes that are active? This mask
drivers/gpu/drm/i915/display/intel_display_types.h +0
-1-* tracks which CRTC's have changed their active state at the end of
drivers/gpu/drm/i915/display/intel_display_types.h +0
-1-* the transaction (not counting the temporary disable during modesets).
drivers/gpu/drm/i915/display/intel_display_types.h +0
-1-* This mask should only be non-zero when intel_state->modeset is true,
drivers/gpu/drm/i915/display/intel_display_types.h +0
-1-* but the converse is not necessarily true; simply changing a mode may
drivers/gpu/drm/i915/display/intel_display_types.h +3
-5-* not flip the final active status of any CRTC's -*/ -u8 active_pipe_changes; -u8 active_pipes;struct intel_shared_dpll_state shared_dpll[I915_NUM_PLLS ];@@ -494,10 +484,30 @@ struct intel_atomic_state {bool rps_interactive;/* -* active_pipes +* active pipes */ bool global_state_changed; +/* +* Does this transaction change the pipes that are active? This mask
drivers/gpu/drm/i915/display/intel_display_types.h +1
-0+* tracks which CRTC's have changed their active state at the end of
drivers/gpu/drm/i915/display/intel_display_types.h +1
-0+* the transaction (not counting the temporary disable during modesets).
drivers/gpu/drm/i915/display/intel_display_types.h +1
-0+* This mask should only be non-zero when intel_state->modeset is true,
drivers/gpu/drm/i915/display/intel_display_types.h +1
-0+* but the converse is not necessarily true; simply changing a mode may
drivers/gpu/drm/i915/display/intel_display_types.h +14
-0+* not flip the final active status of any CRTC's +*/ +u8 active_pipe_changes; + +/* +* More granular change indicator for ddb changes +*/ +bool ddb_state_changed; + +/* +* More granular change indicator for bandwidth state changes +*/ +bool bw_state_changed; +/* Number of enabled DBuf slices */ u8 enabled_dbuf_slices_mask;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3894,7 +3894,7 @@ skl_ddb_get_pipe_allocation_limits(structdrm_i915_private *dev_priv, * that changes the active CRTC list or do modeset would needto
drivers/gpu/drm/i915/intel_pm.c +0
-1* grab _all_ crtc locks, including the one we currently hold. */ -if (!intel_state->active_pipe_changes && !intel_state->modeset){
drivers/gpu/drm/i915/intel_pm.c +4
-0+if (!intel_state->ddb_state_changed) {/* * alloc may be cleared by clear_intel_crtc_state, * copy from old state to be sure @@ -5787,6 +5787,9 @@ static int skl_wm_add_affected_planes(structintel_atomic_state *state, return PTR_ERR(plane_state); new_crtc_state->update_planes |=BIT (plane_id); + + DRM_DEBUG_KMS("Marking ddb state changed for atomic state %p\n", state); + state->ddb_state_changed = true; }return 0;
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
Re: [Intel-gfx] [PATCH v18 4/8] drm/i915: Introduce more *_state_changed indicators
Quoted 14 lines
Quoted 14 lines
But this patch is not about that - it is about how we signal/determine that some change has to be written at commit stage.
As you remember when we were discussed offline, I just wanted to have some expicit way to mark if some global state subsystem had changed, without having to do any additional checks, because imho all the checks we should do during atomic check, while commit simply applies what has to be applied.If you are really against having those boolean or any other way to be able so simply mark some stage object "dirty" (just like mem pages analogy) then would vote at least to have some helper functions to do that.
i.e smth like:
Quoted 4 lines
Quoted 1 line
bool
pipe_sagv_mask_changed(..)This is just a !=, no? Don't see a function really making it any more clear.
it is more compact at least(imho) and also it makes it more clear why
we do this "!=".
Quoted 4 lines
Quoted 2 lines
bool
ddb_state_changed(...)So far I don't see any real need to check for that.
The idea behind this is that we need to recompute SAGV only
when either active pipes had changed or wm/ddb allocations had changed(lets
say we now use a different mode or less planes and so on).
Currently we have _no_ flag that indicates if ddb/wm had changed and
recomputing SAGV everytime "just in case" looks redundant.
To me it looks easier rather than having comparisons with implicit
meaning.
Would be even nicer to unify that idea in a sense that any global object
like bw_state, dbuf_state can be checked if it's state had changed and to
have it as some helper functions for that in intel_global_state.c or something like that.
If you can propose a better way, please do: I think you got the idea,
what I mean.
________________________________
From: Ville Syrjälä <[email protected]>
Sent: Friday, February 28, 2020 6:12:36 PM
To: Lisovskiy, Stanislav
Cc: [email protected]; Roper, Matthew D
Subject: Re: [PATCH v18 4/8] drm/i915: Introduce more *_state_changed indicators
Quoted 66 lines · Stanislav
Quoted 65 lines · Ville Syrjälä
Quoted 38 lines · Stanislav Lisovskiy
The reasoning behind this is such that current dependencies in the code are rather implicit in a sense, we have to constantly check a bunch of different bits like
state->modeset,state->active_pipe_changes, which sometimes can indicate counter intuitive changes.By introducing more fine grained state change tracking we achieve better readability and dependency maintenance for the code.
For example it is no longer needed to evaluate
active_pipe_changesto understand if there were changes for wm/ddb - lets just have a correspondent bit in a state, calledddb_state_changed.
active_pipe_changesjust indicate whether there was some pipe added or removed. Then we evaluate if wm/ddb had been changed. Same for sagv/bw state. ddb changes may or may not affect if out bandwidth constraints have been changed.v2: Add support for older Gens in order not to introduce regressions
Signed-off-by Stanislav Lisovskiy <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 2 ++ drivers/gpu/drm/i915/display/intel_bw.c | 28 ++++++++++++++-(quoted diff) +0
-2- drivers/gpu/drm/i915/display/intel_display.c | 16 ++++++---- .../drm/i915/display/intel_display_types.h | 32 ++++++++++++--- ---- drivers/gpu/drm/i915/intel_pm.c | 5 ++- 5 files changed, 62 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +0
-0drivers/gpu/drm/i915/display/intel_atomic.c void intel_atomic_state_clear(struct · line 530
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_atomic.c +2
-0@@ -525,6 +525,8 @@ void intel_atomic_state_clear(struct drm_atomic_state *s) state->dpll_set = state->modeset = false; state->global_state_changed = false; state->active_pipes =0 ; + state->ddb_state_changed = false; + state->bw_state_changed = false;Not really liking these.
After some pondering I was thinking along the lines of something simple
like this:struct bw_state { u8 sagv_reject; };
bw_check(){ for_each_crtc_in_state() { if (sagv_possible(crtc_state)) new->sagv_reject &= ~BIT(pipe); else new->sagv_reject |= BIT(pipe); }
Quoted 5 lines
Quoted 2 lines
calculate new->qgv_mask }This is exactly what's done in the next patch, except that I store pipe, which are allowed to have SAGV, i.e:
I think inverted mask idea leads to neater code because then we don't have to care which pipes are actually present in the hw and which are fused off/not present:
sagv_reject == 0 -> SAGV possiblesagv_reject != 0 -> SAGV not possible
Quoted 58 lines
struct intel_bw_state { struct intel_global_state base;(quoted diff) +2
-0+ /* + * Contains a bit mask, used to determine, whethercorrespondent
drivers/gpu/drm/i915/display/intel_display_types.h +16
-0+* pipe allows SAGV or not. +*/ +u8 pipe_sagv_mask; + +/* +* Used to determine if we already had calculated +* SAGV mask for this state once. +*/ +bool sagv_calculated; + +/* +* Contains final SAGV decision based on current mask, +* to prevent doing the same job over and over again. +*/ +bool can_sagv; +Also the mask is calculated almost exactly same way:
static void
icl_compute_sagv_mask(struct intel_atomic_state *state)(quoted diff) +5
-0+{ + struct intel_crtc *crtc; + struct intel_crtc_state *new_crtc_state; + int i; + struct intel_bw_state *new_bw_state =
intel_bw_get_state(state);(quoted diff) +10
-0+ + if (IS_ERR(new_bw_state)) { + WARN(1, "Could not get bw_state\n"); + return; + } + + for_each_new_intel_crtc_in_state(state, crtc, + new_crtc_state, i) { + if (skl_can_enable_sagv_on_pipe(state, crtc->pipe)) + new_bw_state->pipe_sagv_mask |= BIT(crtc-Quoted 1 line
pipe);
(quoted diff) +2
-0+ else + new_bw_state->pipe_sagv_mask &= ~BIT(crtc-Quoted 1 line
pipe);
drivers/gpu/drm/i915/display/intel_bw.c +2
-0+ } +}But this patch is not about that - it is about how we signal/determine that some change has to be written at commit stage.
As you remember when we were discussed offline, I just wanted to have some expicit way to mark if some global state subsystem had changed, without having to do any additional checks, because imho all the checks we should do during atomic check, while commit simply applies what has to be applied.
Quoted 7 lines
If you are really against having those boolean or any other way to be able so simply mark some stage object "dirty" (just like mem pages analogy) then would vote at least to have some helper functions to do that.
i.e smth like:bool
pipe_sagv_mask_changed(..)
This is just a !=, no? Don't see a function really making it any more clear.
Quoted 2 lines
bool
ddb_state_changed(...)
So far I don't see any real need to check for that.
Quoted 224 lines
Stan
Quoted 221 lines
Quoted 219 lines
drivers/gpu/drm/i915/display/intel_atomic.c +0
-0}struct
intel_crtc_state*drivers/gpu/drm/i915/display/intel_bw.c +20
-2@@ -424,9 +424,27 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)struct intel_crtc *crtc;int i, ret; -/* FIXME earlier gens need some checks too */ -if (INTEL_GEN (dev_priv) <11 ) +/* +* For earlier Gens let's consider bandwidth changed if ddb requirements, +* has been changed. +*/ +if (INTEL_GEN (dev_priv) <11 ) { +if (state->ddb_state_changed) { + bw_state =intel_bw_get_state (state); +if (IS_ERR (bw_state)) +return PTR_ERR (bw_state); + + ret =intel_atomic_lock_global_state (&bw_state- >base); +if (ret) +return ret; + + DRM_DEBUG_KMS("Marking bw state changed for atomic state %p\n", + state); + + state->bw_state_changed = true; + }return 0 ; + } for_each_oldnew_intel_crtc_in_state(state, crtc,
old_crtc_state,new_crtc_state, i) {drivers/gpu/drm/i915/display/intel_bw.c +5
-1@@ -447,7 +465,7 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) old_active_planes == new_active_planes) continue; - bw_state =intel_bw_get_state (state); + bw_state =intel_bw_get_state (state);if (IS_ERR (bw_state))return PTR_ERR (bw_state);@@ -468,6 +486,10 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)if (ret)return ret; +DRM_DEBUG_KMS ("Marking bw state changed for atomic state %p\n" , state); + + state->bw_state_changed = true; + data_rate =intel_bw_data_rate (dev_priv, bw_state);
num_active_planes= intel_bw_num_active_planes(dev_priv,bw_state);drivers/gpu/drm/i915/display/intel_display.c +0
-0@@ -15540,8 +15540,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) * SKL workaround: bspec recommends we disable the SAGVwhen we
* have more then one pipe enabled
*/drivers/gpu/drm/i915/display/intel_display.c +5
-3-if (!intel_can_enable_sagv (state)) -intel_disable_sagv (dev_priv); +if (state->bw_state_changed) { +if (!intel_can_enable_sagv (state)) +intel_disable_sagv (dev_priv); + }intel_modeset_verify_disabled (dev_priv, state); }@@ -15565,7 +15567,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_encoders_update_prepare (state );/* Enable all new slices, we might need */ -if (state->modeset) +if (state->ddb_state_changed)icl_dbuf_slice_pre_update (state);/* Now enable the clocks, plane, pipe, and connectors that weset up. */
drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -15622,7 +15624,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) }/* Disable all slices, we don't need */ -if (state->modeset) +if (state->ddb_state_changed)icl_dbuf_slice_post_update (state);for_each_oldnew_intel_crtc_in_state(state, crtc,
old_crtc_state,new_crtc_state, i) {drivers/gpu/drm/i915/display/intel_display.c +4
-2@@ -15641,8 +15643,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) if (state->modeset) intel_verify_planes(state); -if (state->modeset &&intel_can_enable_sagv (state)) -intel_enable_sagv (dev_priv); +if (state->bw_state_changed) { + if (intel_can_enable_sagv(state) +intel_enable_sagv (dev_priv); + }drm_atomic_helper_commit_hw_done (&state->base);drivers/gpu/drm/i915/display/intel_display_types.h +0
-2@@ -471,16 +471,6 @@ struct intel_atomic_state {bool dpll_set, modeset; -/* -* Does this transaction change the pipes that are active? This mask
- * tracks which CRTC's have changed their active state at the end of
- * the transaction (not counting the temporary disable during modesets).
- * This mask should only be non-zero whenintel_state->modesetis true,
- * but the converse is not necessarily true; simply changing a mode maydrivers/gpu/drm/i915/display/intel_display_types.h +3
-5-* not flip the final active status of any CRTC's -*/ -u8 active_pipe_changes; -u8 active_pipes;struct intel_shared_dpll_state shared_dpll[I915_NUM_PLLS ];@@ -494,10 +484,30 @@ struct intel_atomic_state {bool rps_interactive;/* -* active_pipes +* active pipes */ bool global_state_changed; +/* +* Does this transaction change the pipes that are active? This mask
+ * tracks which CRTC's have changed their active state at the end of
+ * the transaction (not counting the temporary disable during modesets).
+ * This mask should only be non-zero whenintel_state->modesetis true,
+ * but the converse is not necessarily true; simply changing a mode maydrivers/gpu/drm/i915/display/intel_display_types.h +14
-0+* not flip the final active status of any CRTC's +*/ +u8 active_pipe_changes; + +/* +* More granular change indicator for ddb changes +*/ +bool ddb_state_changed; + +/* +* More granular change indicator for bandwidth state changes +*/ +bool bw_state_changed; +/* Number of enabled DBuf slices */ u8 enabled_dbuf_slices_mask;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3894,7 +3894,7 @@ skl_ddb_get_pipe_allocation_limits(structdrm_i915_private *dev_priv, * that changes the active CRTC list or do modeset would needto
* grab _all_ crtc locks, including the one we currently hold. */
- if (!intel_state->active_pipe_changes && !intel_state->modeset) {
+ if (!intel_state->ddb_state_changed) {
/*
* alloc may be cleared byclear_intel_crtc_state,
* copy from old state to be suredrivers/gpu/drm/i915/intel_pm.c +3
-0@@ -5787,6 +5787,9 @@ static int skl_wm_add_affected_planes(structintel_atomic_state *state, return PTR_ERR(plane_state); new_crtc_state->update_planes |=BIT (plane_id); + + DRM_DEBUG_KMS("Marking ddb state changed for atomic state %p\n", state); + state->ddb_state_changed = true; }return 0;--
2.24.1.485.gad05a3d8e5
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v18 5/8 drm/i915: Refactor intel_can_enable_sagv
In reply to Stanislav LisovskiyCurrently intel_can_enable_sagv function contains a mix of workarounds for different platforms some of them are not valid for gens >= 11 already, so lets split it into separate functions.
v2:
- Rework watermark calculation algorithm to
attempt to calculate Level 0 watermark
with added sagv block time latency and
check if it fits in DBuf in order to
determine if SAGV can be enabled already
at this stage, just as BSpec 49325 states.
if that fails rollback to usual Level 0
latency and disable SAGV.
- Remove unneeded tabs(James Ausmus)
v3: Rebased the patch
v4: - Added back interlaced check for Gen12 and
added separate function for TGL SAGV check
(thanks to James Ausmus for spotting)
- Removed unneeded gen check
- Extracted Gen12 SAGV decision making code
to a separate function from skl_compute_wm
v5: - Added SAGV global state to dev_priv, because
we need to track all pipes, not only those in atomic state. Each pipe has now correspondent bit mask reflecting, whether it can tolerate SAGV or not(thanks to Ville Syrjala for suggestions).
- Now using active flag instead of enable in crc usage check.
v6: - Fixed rebase conflicts
v7: - kms_cursor_legacy seems to get broken because of multiple memcpy
calls when copying level 0 water marks for enabled SAGV, to fix this now simply using that field right away, without copying, for that introduced a new wm_level accessor which decides which wm_level to return based on SAGV state.
v8: - Protect crtc_sagv_mask same way as we do for other global state
changes: i.e check if changes are needed, then grab all crtc locks to serialize the changes(Ville Syrjälä)
- Add crtc_sagv_mask caching in order to avoid needless recalculations (Matthew Roper)
- Put back Gen12 SAGV switch in order to get it enabled in separate patch(Matthew Roper)
- Rename *_set_sagv_mask to *_compute_sagv_mask(Matthew Roper)
- Check if there are no active pipes in intel_can_enable_sagv instead of platform specific functions(Matthew Roper), same for intel_has_sagv check.
v9 - Switched to u8 for crtc_sagv_mask(Ville Syrjälä)
- crtc_sagv_mask now is pipe_sagv_mask(Ville Syrjälä)
- Extracted sagv checking logic from skl/icl/tgl_compute_sagv_mask
- Extracted skl_plane_wm_level function and passing latency to separate patches(Ville Syrjälä)
- Removed part of unneeded copy-paste from tgl_check_pipe_fits_sagv_wm (Ville Syrjälä)
- Now using simple assignment for sagv_wm0 as it contains only pod types and no pointers(Ville Syrjälä)
- Fixed intel_can_enable_sagv not to do double duty, now it only check SAGV bits by ANDing those between local and global state. The SAGV masks are now computed after watermarks are available, in order to be able to figure out if ddb ranges are fitting nicely. (Ville Syrjälä)
- Now having uv_sagv_wm0 and sagv_wm0, otherwise we have wrong logic when using skl_plane_wm_level accessor, as we had previously for Gen11+ color plane and regular wm levels, so probably both has to be recalculated with additional SAGV block time for Level 0.
v10: - Starting to use new global state for storing pipe_sagv_mask
v11: - Fixed rebase conflict with recent drm-tip
- Check if we really need to recalculate SAGV mask, otherwise bail out without making any changes.
- Use cached SAGV result, instead of recalculating it everytime, if bw_state hasn't changed.
v12: - Removed WARN from intel_can_enable_sagv, in some of the commits
if we don't recalculated watermarks, bw_state is not recalculated, thus leading to SAGV state not recalculated by the commit state, which is still calling intel_can_enable_sagv function. Fix that by just analyzing the current global bw_state object - because we simply have no other objects related to that.
v13: - Rebased, fixed warnings regarding long lines
- Changed function call sites from intel_atomic_bw* to intel_wb_* as was suggested.(Jani Nikula)
- Taken ddb_state_changed and bw_state_changed into use.
--- drivers/gpu/drm/i915/display/intel_bw.h | 18 + drivers/gpu/drm/i915/display/intel_display.c | 27 +- .../drm/i915/display/intel_display_types.h | 2 + drivers/gpu/drm/i915/intel_pm.c | 441 ++++++++++++++++-- drivers/gpu/drm/i915/intel_pm.h | 4 +- 5 files changed, 448 insertions(+), 44 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.h +18 -0
@@ -18,6 +18,24 @@ 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_mask; + +/* +* Used to determine if we already had calculated +* SAGV mask for this state once. +*/ +bool sagv_calculated; + +/* +* Contains final SAGV decision based on current mask, +* to prevent doing the same job over and over again. +*/ +bool can_sagv; +unsigned int data_rate[I915_MAX_PIPES ];u8 num_active_planes[I915_MAX_PIPES ]; };
drivers/gpu/drm/i915/display/intel_display.c +18 -9
@@ -13977,7 +13977,10 @@ 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]) || + (skl_wm_level_equals (&hw_plane_wm->wm[level], + &sw_plane_wm->sagv_wm0) && + (level ==0 )))continue ; drm_err(&dev_priv->drm,
@@ -14032,7 +14035,10 @@ 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]) || + (skl_wm_level_equals (&hw_plane_wm->wm[level], + &sw_plane_wm->sagv_wm0) && + (level ==0 )))continue ; drm_err(&dev_priv->drm,
@@ -15509,9 +15515,11 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)* SKL workaround: bspec recommends we disable the SAGV when we * have more then one pipe enabled */ -if (state->bw_state_changed) { -if (!intel_can_enable_sagv (state)) -intel_disable_sagv (dev_priv); +if (INTEL_GEN (dev_priv) <11 ) { +if (state->bw_state_changed) { +if (!intel_can_enable_sagv (dev_priv)) +intel_disable_sagv (dev_priv); + } }intel_modeset_verify_disabled (dev_priv, state);
@@ -15612,9 +15620,11 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)if (state->modeset)intel_verify_planes (state); -if (state->bw_state_changed) { - if (intel_can_enable_sagv(state) -intel_enable_sagv (dev_priv); +if (INTEL_GEN (dev_priv) <11 ) { +if (state->bw_state_changed) { +if (intel_can_enable_sagv (dev_priv)) +intel_enable_sagv (dev_priv); + } }drm_atomic_helper_commit_hw_done (&state->base);
@@ -15767,7 +15777,6 @@ static int intel_atomic_commit(struct drm_device *dev,if (state->global_state_changed) {assert_global_state_locked (dev_priv); - dev_priv->active_pipes = state->active_pipes; }
drivers/gpu/drm/i915/display/intel_display_types.h +2 -0
@@ -664,6 +664,8 @@ 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; };
drivers/gpu/drm/i915/intel_pm.c +407 -34
621 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.h +3 -1
@@ -41,7 +41,9 @@ 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 (struct drm_i915_private *dev_priv); +bool intel_can_enable_sagv_for_state (struct intel_atomic_state *state); +bool intel_has_sagv (struct drm_i915_private *dev_priv);int intel_enable_sagv (struct drm_i915_private *dev_priv);int intel_disable_sagv (struct drm_i915_private *dev_priv); bool skl_wm_level_equals(const struct skl_wm_level *l1,
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v18 5/8 drm/i915: Refactor intel_can_enable_sagv
Currently intel_can_enable_sagv function contains a mix of workarounds for different platforms some of them are not valid for gens >= 11 already, so lets split it into separate functions.
v2:
- Rework watermark calculation algorithm to
attempt to calculate Level 0 watermark
with added sagv block time latency and
check if it fits in DBuf in order to
determine if SAGV can be enabled already
at this stage, just as BSpec 49325 states.
if that fails rollback to usual Level 0
latency and disable SAGV.
- Remove unneeded tabs(James Ausmus)
v3: Rebased the patch
v4: - Added back interlaced check for Gen12 and
added separate function for TGL SAGV check
(thanks to James Ausmus for spotting)
- Removed unneeded gen check
- Extracted Gen12 SAGV decision making code
to a separate function from skl_compute_wm
v5: - Added SAGV global state to dev_priv, because
we need to track all pipes, not only those in atomic state. Each pipe has now correspondent bit mask reflecting, whether it can tolerate SAGV or not(thanks to Ville Syrjala for suggestions).
- Now using active flag instead of enable in crc usage check.
v6: - Fixed rebase conflicts
v7: - kms_cursor_legacy seems to get broken because of multiple memcpy
calls when copying level 0 water marks for enabled SAGV, to fix this now simply using that field right away, without copying, for that introduced a new wm_level accessor which decides which wm_level to return based on SAGV state.
v8: - Protect crtc_sagv_mask same way as we do for other global state
changes: i.e check if changes are needed, then grab all crtc locks to serialize the changes(Ville Syrjälä)
- Add crtc_sagv_mask caching in order to avoid needless recalculations (Matthew Roper)
- Put back Gen12 SAGV switch in order to get it enabled in separate patch(Matthew Roper)
- Rename *_set_sagv_mask to *_compute_sagv_mask(Matthew Roper)
- Check if there are no active pipes in intel_can_enable_sagv instead of platform specific functions(Matthew Roper), same for intel_has_sagv check.
v9 - Switched to u8 for crtc_sagv_mask(Ville Syrjälä)
- crtc_sagv_mask now is pipe_sagv_mask(Ville Syrjälä)
- Extracted sagv checking logic from skl/icl/tgl_compute_sagv_mask
- Extracted skl_plane_wm_level function and passing latency to separate patches(Ville Syrjälä)
- Removed part of unneeded copy-paste from tgl_check_pipe_fits_sagv_wm (Ville Syrjälä)
- Now using simple assignment for sagv_wm0 as it contains only pod types and no pointers(Ville Syrjälä)
- Fixed intel_can_enable_sagv not to do double duty, now it only check SAGV bits by ANDing those between local and global state. The SAGV masks are now computed after watermarks are available, in order to be able to figure out if ddb ranges are fitting nicely. (Ville Syrjälä)
- Now having uv_sagv_wm0 and sagv_wm0, otherwise we have wrong logic when using skl_plane_wm_level accessor, as we had previously for Gen11+ color plane and regular wm levels, so probably both has to be recalculated with additional SAGV block time for Level 0.
v10: - Starting to use new global state for storing pipe_sagv_mask
v11: - Fixed rebase conflict with recent drm-tip
- Check if we really need to recalculate SAGV mask, otherwise bail out without making any changes.
- Use cached SAGV result, instead of recalculating it everytime, if bw_state hasn't changed.
v12: - Removed WARN from intel_can_enable_sagv, in some of the commits
if we don't recalculated watermarks, bw_state is not recalculated, thus leading to SAGV state not recalculated by the commit state, which is still calling intel_can_enable_sagv function. Fix that by just analyzing the current global bw_state object - because we simply have no other objects related to that.
v13: - Rebased, fixed warnings regarding long lines
- Changed function call sites from intel_atomic_bw* to intel_wb_* as was suggested.(Jani Nikula)
- Taken ddb_state_changed and bw_state_changed into use.
v14: - total_affected_planes is no longer needed to check for ddb changes,
just as active_pipe_changes.
--- drivers/gpu/drm/i915/display/intel_bw.h | 18 + drivers/gpu/drm/i915/display/intel_display.c | 27 +- .../drm/i915/display/intel_display_types.h | 2 + drivers/gpu/drm/i915/intel_pm.c | 428 ++++++++++++++++-- drivers/gpu/drm/i915/intel_pm.h | 4 +- 5 files changed, 437 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.h +18 -0
@@ -18,6 +18,24 @@ 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_mask; + +/* +* Used to determine if we already had calculated +* SAGV mask for this state once. +*/ +bool sagv_calculated; + +/* +* Contains final SAGV decision based on current mask, +* to prevent doing the same job over and over again. +*/ +bool can_sagv; +unsigned int data_rate[I915_MAX_PIPES ];u8 num_active_planes[I915_MAX_PIPES ]; };
drivers/gpu/drm/i915/display/intel_display.c +18 -9
@@ -14007,7 +14007,10 @@ 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]) || + (skl_wm_level_equals (&hw_plane_wm->wm[level], + &sw_plane_wm->sagv_wm0) && + (level ==0 )))continue ; drm_err(&dev_priv->drm,
@@ -14062,7 +14065,10 @@ 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]) || + (skl_wm_level_equals (&hw_plane_wm->wm[level], + &sw_plane_wm->sagv_wm0) && + (level ==0 )))continue ; drm_err(&dev_priv->drm,
@@ -15540,9 +15546,11 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)* SKL workaround: bspec recommends we disable the SAGV when we * have more then one pipe enabled */ -if (state->bw_state_changed) { -if (!intel_can_enable_sagv (state)) -intel_disable_sagv (dev_priv); +if (INTEL_GEN (dev_priv) <11 ) { +if (state->bw_state_changed) { +if (!intel_can_enable_sagv (dev_priv)) +intel_disable_sagv (dev_priv); + } }intel_modeset_verify_disabled (dev_priv, state);
@@ -15643,9 +15651,11 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)if (state->modeset)intel_verify_planes (state); -if (state->bw_state_changed) { - if (intel_can_enable_sagv(state) -intel_enable_sagv (dev_priv); +if (INTEL_GEN (dev_priv) <11 ) { +if (state->bw_state_changed) { +if (intel_can_enable_sagv (dev_priv)) +intel_enable_sagv (dev_priv); + } }drm_atomic_helper_commit_hw_done (&state->base);
@@ -15798,7 +15808,6 @@ static int intel_atomic_commit(struct drm_device *dev,if (state->global_state_changed) {assert_global_state_locked (dev_priv); - dev_priv->active_pipes = state->active_pipes; }
drivers/gpu/drm/i915/display/intel_display_types.h +2 -0
@@ -664,6 +664,8 @@ 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; };
drivers/gpu/drm/i915/intel_pm.c +396 -32
581 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.h +3 -1
@@ -41,7 +41,9 @@ 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 (struct drm_i915_private *dev_priv); +bool intel_can_enable_sagv_for_state (struct intel_atomic_state *state); +bool intel_has_sagv (struct drm_i915_private *dev_priv);int intel_enable_sagv (struct drm_i915_private *dev_priv);int intel_disable_sagv (struct drm_i915_private *dev_priv); bool skl_wm_level_equals(const struct skl_wm_level *l1,
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v18 5/8 drm/i915: Refactor intel_can_enable_sagv
Currently intel_can_enable_sagv function contains a mix of workarounds for different platforms some of them are not valid for gens >= 11 already, so lets split it into separate functions.
v2:
- Rework watermark calculation algorithm to
attempt to calculate Level 0 watermark
with added sagv block time latency and
check if it fits in DBuf in order to
determine if SAGV can be enabled already
at this stage, just as BSpec 49325 states.
if that fails rollback to usual Level 0
latency and disable SAGV.
- Remove unneeded tabs(James Ausmus)
v3: Rebased the patch
v4: - Added back interlaced check for Gen12 and
added separate function for TGL SAGV check
(thanks to James Ausmus for spotting)
- Removed unneeded gen check
- Extracted Gen12 SAGV decision making code
to a separate function from skl_compute_wm
v5: - Added SAGV global state to dev_priv, because
we need to track all pipes, not only those in atomic state. Each pipe has now correspondent bit mask reflecting, whether it can tolerate SAGV or not(thanks to Ville Syrjala for suggestions).
- Now using active flag instead of enable in crc usage check.
v6: - Fixed rebase conflicts
v7: - kms_cursor_legacy seems to get broken because of multiple memcpy
calls when copying level 0 water marks for enabled SAGV, to fix this now simply using that field right away, without copying, for that introduced a new wm_level accessor which decides which wm_level to return based on SAGV state.
v8: - Protect crtc_sagv_mask same way as we do for other global state
changes: i.e check if changes are needed, then grab all crtc locks to serialize the changes(Ville Syrjälä)
- Add crtc_sagv_mask caching in order to avoid needless recalculations (Matthew Roper)
- Put back Gen12 SAGV switch in order to get it enabled in separate patch(Matthew Roper)
- Rename *_set_sagv_mask to *_compute_sagv_mask(Matthew Roper)
- Check if there are no active pipes in intel_can_enable_sagv instead of platform specific functions(Matthew Roper), same for intel_has_sagv check.
v9 - Switched to u8 for crtc_sagv_mask(Ville Syrjälä)
- crtc_sagv_mask now is pipe_sagv_mask(Ville Syrjälä)
- Extracted sagv checking logic from skl/icl/tgl_compute_sagv_mask
- Extracted skl_plane_wm_level function and passing latency to separate patches(Ville Syrjälä)
- Removed part of unneeded copy-paste from tgl_check_pipe_fits_sagv_wm (Ville Syrjälä)
- Now using simple assignment for sagv_wm0 as it contains only pod types and no pointers(Ville Syrjälä)
- Fixed intel_can_enable_sagv not to do double duty, now it only check SAGV bits by ANDing those between local and global state. The SAGV masks are now computed after watermarks are available, in order to be able to figure out if ddb ranges are fitting nicely. (Ville Syrjälä)
- Now having uv_sagv_wm0 and sagv_wm0, otherwise we have wrong logic when using skl_plane_wm_level accessor, as we had previously for Gen11+ color plane and regular wm levels, so probably both has to be recalculated with additional SAGV block time for Level 0.
v10: - Starting to use new global state for storing pipe_sagv_mask
v11: - Fixed rebase conflict with recent drm-tip
- Check if we really need to recalculate SAGV mask, otherwise bail out without making any changes.
- Use cached SAGV result, instead of recalculating it everytime, if bw_state hasn't changed.
v12: - Removed WARN from intel_can_enable_sagv, in some of the commits
if we don't recalculated watermarks, bw_state is not recalculated, thus leading to SAGV state not recalculated by the commit state, which is still calling intel_can_enable_sagv function. Fix that by just analyzing the current global bw_state object - because we simply have no other objects related to that.
v13: - Rebased, fixed warnings regarding long lines
- Changed function call sites from intel_atomic_bw* to intel_wb_* as was suggested.(Jani Nikula)
- Taken ddb_state_changed and bw_state_changed into use.
v14: - total_affected_planes is no longer needed to check for ddb changes,
just as active_pipe_changes.
v15: - Fixed stupid mistake with uninitialized crtc in
skl_compute_sagv_mask.
--- drivers/gpu/drm/i915/display/intel_bw.h | 18 + drivers/gpu/drm/i915/display/intel_display.c | 27 +- .../drm/i915/display/intel_display_types.h | 2 + drivers/gpu/drm/i915/intel_pm.c | 427 ++++++++++++++++-- drivers/gpu/drm/i915/intel_pm.h | 4 +- 5 files changed, 436 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.h +18 -0
@@ -18,6 +18,24 @@ 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_mask; + +/* +* Used to determine if we already had calculated +* SAGV mask for this state once. +*/ +bool sagv_calculated; + +/* +* Contains final SAGV decision based on current mask, +* to prevent doing the same job over and over again. +*/ +bool can_sagv; +unsigned int data_rate[I915_MAX_PIPES ];u8 num_active_planes[I915_MAX_PIPES ]; };
drivers/gpu/drm/i915/display/intel_display.c +18 -9
@@ -14016,7 +14016,10 @@ 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]) || + (skl_wm_level_equals (&hw_plane_wm->wm[level], + &sw_plane_wm->sagv_wm0) && + (level ==0 )))continue ; drm_err(&dev_priv->drm,
@@ -14071,7 +14074,10 @@ 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]) || + (skl_wm_level_equals (&hw_plane_wm->wm[level], + &sw_plane_wm->sagv_wm0) && + (level ==0 )))continue ; drm_err(&dev_priv->drm,
@@ -15548,9 +15554,11 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)* SKL workaround: bspec recommends we disable the SAGV when we * have more then one pipe enabled */ -if (state->bw_state_changed) { -if (!intel_can_enable_sagv (state)) -intel_disable_sagv (dev_priv); +if (INTEL_GEN (dev_priv) <11 ) { +if (state->bw_state_changed) { +if (!intel_can_enable_sagv (dev_priv)) +intel_disable_sagv (dev_priv); + } }intel_modeset_verify_disabled (dev_priv, state);
@@ -15651,9 +15659,11 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)if (state->modeset)intel_verify_planes (state); -if (state->bw_state_changed) { - if (intel_can_enable_sagv(state) -intel_enable_sagv (dev_priv); +if (INTEL_GEN (dev_priv) <11 ) { +if (state->bw_state_changed) { +if (intel_can_enable_sagv (dev_priv)) +intel_enable_sagv (dev_priv); + } }drm_atomic_helper_commit_hw_done (&state->base);
@@ -15806,7 +15816,6 @@ static int intel_atomic_commit(struct drm_device *dev,if (state->global_state_changed) {assert_global_state_locked (dev_priv); - dev_priv->active_pipes = state->active_pipes; }
drivers/gpu/drm/i915/display/intel_display_types.h +2 -0
@@ -663,6 +663,8 @@ 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; };
drivers/gpu/drm/i915/intel_pm.c +395 -32
580 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.h +3 -1
@@ -41,7 +41,9 @@ 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 (struct drm_i915_private *dev_priv); +bool intel_can_enable_sagv_for_state (struct intel_atomic_state *state); +bool intel_has_sagv (struct drm_i915_private *dev_priv);int intel_enable_sagv (struct drm_i915_private *dev_priv);int intel_disable_sagv (struct drm_i915_private *dev_priv); bool skl_wm_level_equals(const struct skl_wm_level *l1,
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v18 6/8 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ä)
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_sideband.c | 2 ++ 2 files changed, 6 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -8997,6 +8997,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
@@ -9018,6 +9019,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
@@ -9030,6 +9032,8 @@ enum {#define GEN9_SAGV_IS_DISABLED 0x1#define GEN9_SAGV_ENABLE 0x3#define GEN12_PCODE_READ_SAGV_BLOCK_TIME_US 0x23 +#define GEN11_PCODE_POINTS_RESTRICTED 0x0 +#define GEN11_PCODE_POINTS_RESTRICTED_MASK 0x1#define GEN6_PCODE_DATA _MMIO(0x138128)#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16
drivers/gpu/drm/i915/intel_sideband.c +2 -0
@@ -370,6 +370,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 v18 7/8 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.
--- drivers/gpu/drm/i915/display/intel_bw.c | 180 +++++++++++++------ drivers/gpu/drm/i915/display/intel_bw.h | 9 + drivers/gpu/drm/i915/display/intel_display.c | 114 +++++++++++- drivers/gpu/drm/i915/i915_drv.h | 3 + 4 files changed, 254 insertions(+), 52 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.c +130 -50
@@ -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 ; }
@@ -259,7 +292,7 @@ static unsigned int icl_max_bw(struct drm_i915_private *dev_priv,if (qgv_point >= bi->num_qgv_points)return UINT_MAX ; -if (num_planes >= bi->num_planes) +if (num_planes >= bi->num_planes || !num_planes)return bi->deratedbw[qgv_point]; }
@@ -277,34 +310,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) {/*
@@ -418,11 +423,16 @@ 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 ; -unsigned int data_rate, max_data_rate; +struct intel_bw_state *new_bw_state =NULL ; +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 )
@@ -447,43 +457,113 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) old_active_planes == new_active_planes)continue ; - bw_state =intel_bw_get_state (state); -if (IS_ERR (bw_state)) -return PTR_ERR (bw_state); + new_bw_state =intel_bw_get_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); -if (ret) +/* +* TODO: Should we just call intel_atomic_serialize_global_state here? +* we anyway already have different data rates and this call is +* is almost similar, except that it doesn't call duplicate_state +* hook. +*/ + ret =intel_atomic_lock_global_state (&new_bw_state->base); +if (ret) { +DRM_DEBUG_KMS ("Could not lock global state\n" );return ret; + } - state->bw_state_changed = true; + data_rate =intel_bw_data_rate (dev_priv, new_bw_state); + num_active_planes =intel_bw_num_active_planes (dev_priv, new_bw_state); - data_rate =intel_bw_data_rate (dev_priv, bw_state); - num_active_planes =intel_bw_num_active_planes (dev_priv, bw_state); + data_rate =DIV_ROUND_UP (data_rate,1000 ); - 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 for display configuration.\n" );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_for_state (state)) { + allowed_points =1 << 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; + +DRM_DEBUG_KMS ("New state %p qgv mask %x\n" , + state, new_bw_state->qgv_points_mask); + + old_bw_state =intel_bw_get_old_state (state); +if (IS_ERR (old_bw_state)) { +DRM_DEBUG_KMS ("Could not get old bw state!\n" ); +return PTR_ERR (old_bw_state); + } + +/* +* 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) { + + state->bw_state_changed = true; + + ret =intel_atomic_serialize_global_state (&new_bw_state->base); +if (ret) { +DRM_DEBUG_KMS ("Could not serialize global state\n" ); +return ret; + } + } +return 0 ; }
drivers/gpu/drm/i915/display/intel_bw.h +9 -0
@@ -36,6 +36,13 @@ struct intel_bw_state {*/ bool can_sagv; +/* +* 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 ]; };
@@ -56,5 +63,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.c +112 -2
134 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -841,6 +841,9 @@ enum intel_pipe_crc_source { INTEL_PIPE_CRC_SOURCE_MAX, }; +/* BSpec precisely defines this */ +#define NUM_SAGV_POINTS 8 +#define INTEL_PIPE_CRC_ENTRIES_NR 128struct intel_pipe_crc {spinlock_t lock;
Signature · 6 lines
2.24.1.485.gad05a3d8e5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v18 7/8 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.
--- drivers/gpu/drm/i915/display/intel_bw.c | 184 +++++++++++++------ drivers/gpu/drm/i915/display/intel_bw.h | 9 + drivers/gpu/drm/i915/display/intel_display.c | 125 ++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 3 + 4 files changed, 255 insertions(+), 66 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.c +128 -56
@@ -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 ; }
@@ -259,7 +292,7 @@ static unsigned int icl_max_bw(struct drm_i915_private *dev_priv,if (qgv_point >= bi->num_qgv_points)return UINT_MAX ; -if (num_planes >= bi->num_planes) +if (num_planes >= bi->num_planes || !num_planes)return bi->deratedbw[qgv_point]; }
@@ -277,34 +310,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) {/*
@@ -418,11 +423,16 @@ 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 ; -unsigned int data_rate, max_data_rate; +struct intel_bw_state *new_bw_state =NULL ; +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 ;/* * For earlier Gens let's consider bandwidth changed if ddb requirements,
@@ -430,11 +440,11 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)*/ if (INTEL_GEN (dev_priv) <11 ) {if (state->ddb_state_changed) { - bw_state =intel_bw_get_state (state); -if (IS_ERR (bw_state)) -return PTR_ERR (bw_state); + new_bw_state =intel_bw_get_state (state); +if (IS_ERR (new_bw_state)) +return PTR_ERR (new_bw_state); - ret =intel_atomic_lock_global_state (&bw_state->base); + ret =intel_atomic_lock_global_state (&new_bw_state->base);if (ret)return ret;
@@ -465,45 +475,107 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) old_active_planes == new_active_planes)continue ; - bw_state =intel_bw_get_state (state); -if (IS_ERR (bw_state)) -return PTR_ERR (bw_state); + new_bw_state =intel_bw_get_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); -if (ret) + ret =intel_atomic_lock_global_state (&new_bw_state->base); +if (ret) { +DRM_DEBUG_KMS ("Could not lock global state\n" );return ret; + } -DRM_DEBUG_KMS ("Marking bw state changed for atomic state %p\n" , state); - - state->bw_state_changed = true; + data_rate =intel_bw_data_rate (dev_priv, new_bw_state); + data_rate =DIV_ROUND_UP (data_rate,1000 ); - data_rate =intel_bw_data_rate (dev_priv, bw_state); - num_active_planes =intel_bw_num_active_planes (dev_priv, 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); +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 for display configuration.\n" );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_for_state (state)) { + allowed_points =1 << 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; + +DRM_DEBUG_KMS ("New state %p qgv mask %x\n" , + state, new_bw_state->qgv_points_mask); + + old_bw_state =intel_bw_get_old_state (state); +if (IS_ERR (old_bw_state)) { +DRM_DEBUG_KMS ("Could not get old bw state!\n" ); +return PTR_ERR (old_bw_state); + } + +/* +* 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) { +DRM_DEBUG_KMS ("Could not serialize global state\n" ); +return ret; + } + +DRM_DEBUG_KMS ("Marking bw state changed for atomic state %p\n" , state); + state->bw_state_changed = true; + } +return 0 ; }
drivers/gpu/drm/i915/display/intel_bw.h +9 -0
@@ -36,6 +36,13 @@ struct intel_bw_state {*/ bool can_sagv; +/* +* 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 ]; };
@@ -56,5 +63,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.c +115 -10
149 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -841,6 +841,9 @@ enum intel_pipe_crc_source { INTEL_PIPE_CRC_SOURCE_MAX, }; +/* BSpec precisely defines this */ +#define NUM_SAGV_POINTS 8 +#define INTEL_PIPE_CRC_ENTRIES_NR 128struct intel_pipe_crc {spinlock_t lock;
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 v18 7/8] drm/i915: Restrict qgv points which don't have enough bandwidth.
Quoted 234 lines · Stanislav Lisovskiy
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.
- FixNUM_QGV_POINTSto 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 todev_priv(thanks to Ville for the hint).v11: - Remove unneeded headers and spaces(Matthew Roper)
- Remove unneededintel_qgv_infoqi struct from bw check and zero out the needed one(Matthew Roper)
- Changed QGV error message to have more clear meaning(Matthew Roper)
- Usestate->modeset_setinstead ofany_ms(Matthew Roper)
- MovedNUM_SAGV_POINTSfromi915_reg.htoi915_drv.hwhere it's used
- Keep usingcrtc_state->hw.activeinstead of .enable(Matthew Roper)
- Moved unrelated changes to otherpatch(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 toicl_get_bw_infofrom 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_ratein bw check to closer scope(Ville Syrjälä)
- Changed comment for zeronew_maskin qgv points masking function to better reflect reality(Ville Syrjälä)
- Simplified bit mask operation in qgv points masking function (Ville Syrjälä)
- Movedintel_qgv_points_maskcloser to gen11 SAGV disabling, however this still can't be under modeset condition(Ville Syrjälä)
- Packedqgv_points_maskas u8 and moved closer topipe_sagv_mask(Ville Syrjälä)
- Extracted PCode changes to separate patch.(Ville Syrjälä)
- Now treatnum_planes0 same as 1 to avoid confusion and returningmax_bwas 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 actualqgv_points_maskswap 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 landsv14: - 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.
- Takebw_state_changedflag into use.Signed-off-by Stanislav Lisovskiy <[email protected]>Cc Ville Syrjälä <[email protected]>Cc James Ausmus <[email protected]>--- drivers/gpu/drm/i915/display/intel_bw.c | 184 +++++++++++++------ drivers/gpu/drm/i915/display/intel_bw.h | 9 + drivers/gpu/drm/i915/display/intel_display.c | 125 ++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 3 + 4 files changed, 255 insertions(+), 66 deletions(-)drivers/gpu/drm/i915/display/intel_bw.c +41
-31@@ -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 ; }@@ -259,7 +292,7 @@ static unsigned int icl_max_bw(struct drm_i915_private *dev_priv,if (qgv_point >= bi->num_qgv_points)return UINT_MAX ; -if (num_planes >= bi->num_planes) +if (num_planes >= bi->num_planes || !num_planes)return bi->deratedbw[qgv_point]; }@@ -277,34 +310,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) {/* @@ -418,11 +423,16 @@ 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 ; -unsigned int data_rate, max_data_rate; +struct intel_bw_state *new_bw_state =NULL ; +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 ;/* * For earlier Gens let's consider bandwidth changed if ddb requirements,
drivers/gpu/drm/i915/display/intel_bw.c int intel_bw_atomic_check(struct intel_atomic_state *state) · line 445
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_bw.c +3
-3@@ -430,11 +440,11 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)*/ if (INTEL_GEN (dev_priv) <11 ) {if (state->ddb_state_changed) { - bw_state =intel_bw_get_state (state); -if (IS_ERR (bw_state)) -return PTR_ERR (bw_state); + new_bw_state =intel_bw_get_state (state); +if (IS_ERR (new_bw_state)) +return PTR_ERR (new_bw_state);
Lot's of rename noise in the patch. Can't really see what's going on unless those are split out.
Quoted 166 lines
drivers/gpu/drm/i915/display/intel_bw.c +84
-22- ret =intel_atomic_lock_global_state (&bw_state->base); + ret =intel_atomic_lock_global_state (&new_bw_state->base);if (ret)return ret;@@ -465,45 +475,107 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) old_active_planes == new_active_planes)continue ; - bw_state =intel_bw_get_state (state); -if (IS_ERR (bw_state)) -return PTR_ERR (bw_state); + new_bw_state =intel_bw_get_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); -if (ret) + ret =intel_atomic_lock_global_state (&new_bw_state->base); +if (ret) { +DRM_DEBUG_KMS ("Could not lock global state\n" );return ret; + } -DRM_DEBUG_KMS ("Marking bw state changed for atomic state %p\n" , state); - - state->bw_state_changed = true; + data_rate =intel_bw_data_rate (dev_priv, new_bw_state); + data_rate =DIV_ROUND_UP (data_rate,1000 ); - data_rate =intel_bw_data_rate (dev_priv, bw_state); - num_active_planes =intel_bw_num_active_planes (dev_priv, 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); +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 for display configuration.\n" );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_for_state (state)) { + allowed_points =1 << 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; + +DRM_DEBUG_KMS ("New state %p qgv mask %x\n" , + state, new_bw_state->qgv_points_mask); + + old_bw_state =intel_bw_get_old_state (state); +if (IS_ERR (old_bw_state)) { +DRM_DEBUG_KMS ("Could not get old bw state!\n" ); +return PTR_ERR (old_bw_state); + } + +/* +* 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) { +DRM_DEBUG_KMS ("Could not serialize global state\n" ); +return ret; + } + +DRM_DEBUG_KMS ("Marking bw state changed for atomic state %p\n" , state); + state->bw_state_changed = true; + } +return 0 ; }drivers/gpu/drm/i915/display/intel_bw.h +9
-0@@ -36,6 +36,13 @@ struct intel_bw_state {*/ bool can_sagv; +/* +* 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 ]; };@@ -56,5 +63,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.c +0
-0
drivers/gpu/drm/i915/display/intel_display.c static void intel_atomic_cleanup_work(struct work_struct *work) · line 15507
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-0@@ -15504,6 +15504,105 @@ static void intel_atomic_cleanup_work(struct work_struct *work)intel_atomic_helper_free_state (i915); } +static void intel_qgv_points_mask (struct intel_atomic_state *state)
I think we should move these next to the other sagv code and just call them somehting like intel_sagv_{pre,post}_plane_update() to
a) avoid the caller having to know anything about them, b) match the pattern used for other similar things.
And I think the internals should just be something like:
intel_sagv_pre/post_plane_update()
{
new_bw_state = get_new_bw_state();
old_bw_state = get_old_bw_state();
if (!new_bw_state ||
new_bw_state->sagv_mask == old_bw_state->sagv_mask)
return;
do the pcode dance
}I don't see a need for any more checks than than because that would just mean that bw_check() is broken and needs to be fixed.
Quoted 164 lines
drivers/gpu/drm/i915/display/intel_display.c +114
-10+{ +struct drm_device *dev = state->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +int ret; +struct intel_bw_state *new_bw_state =NULL ; +struct intel_bw_state *old_bw_state =NULL ; +u32 new_mask =0 ; +unsigned int num_qgv_points = dev_priv->max_bw[0 ].num_qgv_points; +unsigned int mask = (1 << num_qgv_points) -1 ; + + new_bw_state =intel_bw_get_state (state); +if (IS_ERR (new_bw_state)) { +WARN (1 ,"Could not get new bw_state!\n" ); +return ; + } + + old_bw_state =intel_bw_get_old_state (state); +if (IS_ERR (old_bw_state)) { +WARN (1 ,"Could not get old bw_state!\n" ); +return ; + } + + new_mask = old_bw_state->qgv_points_mask | new_bw_state->qgv_points_mask; + +/* +* If new mask is zero - means there is nothing to mask, +* we can only unmask, which should be done in unmask. +*/ +if (!new_mask) +return ; + +WARN_ON (new_mask == mask); + +/* +* Just return if we can't control SAGV or don't have it. +*/ +if (!intel_has_sagv (dev_priv)) +return ; + +/* +* Restrict required qgv points before updating the configuration. +* According to BSpec we can't mask and unmask qgv points at the same +* time. Also masking should be done before updating the configuration +* and unmasking afterwards. +*/ + ret =icl_pcode_restrict_qgv_points (dev_priv, new_mask); +if (ret <0 ) +DRM_DEBUG_KMS ("Could not mask required qgv points(%d)\n" , + ret); +} + +static void intel_qgv_points_unmask (struct intel_atomic_state *state) +{ +struct drm_device *dev = state->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +int ret; +struct intel_bw_state *new_bw_state =NULL ; +struct intel_bw_state *old_bw_state =NULL ; +u32 new_mask =0 ; + + new_bw_state =intel_bw_get_state (state); +if (IS_ERR (new_bw_state)) { +WARN (1 ,"Could not get new bw_state!\n" ); +return ; + } + + old_bw_state =intel_bw_get_old_state (state); +if (IS_ERR (old_bw_state)) { +WARN (1 ,"Could not get new bw_state!\n" ); +return ; + } + + new_mask = new_bw_state->qgv_points_mask; + +/* +* Just return if we can't control SAGV or don't have it. +*/ +if (!intel_has_sagv (dev_priv)) +return ; + +/* +* Nothing to unmask +*/ +if (new_mask == old_bw_state->qgv_points_mask) +return ; + +/* +* Allow required qgv points after updating the configuration. +* According to BSpec we can't mask and unmask qgv points at the same +* time. Also masking should be done before updating the configuration +* and unmasking afterwards. +*/ + ret =icl_pcode_restrict_qgv_points (dev_priv, new_mask); +if (ret <0 ) +DRM_DEBUG_KMS ("Could not unmask required qgv points(%d)\n" , + ret); +} +static void intel_atomic_commit_tail (struct intel_atomic_state *state) {struct drm_device *dev = state->base.dev;@@ -15537,6 +15636,15 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) crtc->config = new_crtc_state; +/* +* Now we need to check if SAGV needs to be disabled(i.e QGV points +* modified even, when no modeset is done(for example plane updates +* can now trigger that). +*/ +if ((INTEL_GEN (dev_priv) >=11 )) +if (state->bw_state_changed) +intel_qgv_points_mask (state); +if (state->modeset) {drm_atomic_helper_update_legacy_modeset_state (dev, &state->base);@@ -15546,12 +15654,9 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)* SKL workaround: bspec recommends we disable the SAGV when we * have more then one pipe enabled */ -if (INTEL_GEN (dev_priv) <11 ) { -if (state->bw_state_changed) { -if (!intel_can_enable_sagv (dev_priv)) -intel_disable_sagv (dev_priv); - } - } +if ((INTEL_GEN (dev_priv) <11 )) +if (!intel_can_enable_sagv (dev_priv)) +intel_disable_sagv (dev_priv);intel_modeset_verify_disabled (dev_priv, state); }@@ -15652,10 +15757,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_verify_planes (state);if (INTEL_GEN (dev_priv) <11 ) { -if (state->bw_state_changed) { -if (intel_can_enable_sagv (dev_priv)) -intel_enable_sagv (dev_priv); - } +if (intel_can_enable_sagv (dev_priv)) +intel_enable_sagv (dev_priv); + }else if (state->bw_state_changed) { +intel_qgv_points_unmask (state); }drm_atomic_helper_commit_hw_done (&state->base);drivers/gpu/drm/i915/i915_drv.h +3
-0@@ -841,6 +841,9 @@ enum intel_pipe_crc_source { INTEL_PIPE_CRC_SOURCE_MAX, }; +/* BSpec precisely defines this */ +#define NUM_SAGV_POINTS 8 +#define INTEL_PIPE_CRC_ENTRIES_NR 128struct intel_pipe_crc {spinlock_t lock;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
Re: [Intel-gfx] [PATCH v18 7/8] drm/i915: Restrict qgv points which don't have enough bandwidth.
Quoted 503 lines · Ville Syrjälä
Quoted 269 lines · Stanislav Lisovskiy
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.
- FixNUM_QGV_POINTSto 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 todev_priv(thanks to Ville for the hint).v11: - Remove unneeded headers and spaces(Matthew Roper)
- Remove unneededintel_qgv_infoqi struct from bw check and
zero
out the needed one(Matthew Roper)
- Changed QGV error message to have more clear meaning(Matthew
Roper)
- Usestate->modeset_setinstead ofany_ms(Matthew Roper)
- MovedNUM_SAGV_POINTSfromi915_reg.htoi915_drv.hwhere
it's used
- Keep usingcrtc_state->hw.activeinstead 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 toicl_get_bw_infofrom 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_ratein bw check to closer scope(Ville Syrjälä)
- Changed comment for zeronew_maskin qgv points masking
function
to better reflect reality(Ville Syrjälä)
- Simplified bit mask operation in qgv points masking function (Ville Syrjälä)
- Movedintel_qgv_points_maskcloser to gen11 SAGV disabling, however this still can't be under modeset condition(Ville
Syrjälä)
- Packedqgv_points_maskas u8 and moved closer topipe_sagv_mask
(Ville Syrjälä)
- Extracted PCode changes to separate patch.(Ville Syrjälä)
- Now treatnum_planes0 same as 1 to avoid confusion and returningmax_bwas 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 actualqgv_points_maskswap 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 landsv14: - 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.
- Takebw_state_changedflag into use.Signed-off-by Stanislav Lisovskiy <[email protected]>Cc Ville Syrjälä <[email protected]>Cc James Ausmus <[email protected]>--- drivers/gpu/drm/i915/display/intel_bw.c | 184 +++++++++++++ ------ drivers/gpu/drm/i915/display/intel_bw.h | 9 + drivers/gpu/drm/i915/display/intel_display.c | 125 ++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 3 + 4 files changed, 255 insertions(+), 66 deletions(-)drivers/gpu/drm/i915/display/intel_bw.c +23
-0@@ -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,drivers/gpu/drm/i915/display/intel_bw.c +0
-0struct intel_qgv_info *qi) {@@ -240,6 +263,16 @@ static int icl_get_bw_info(struct
drm_i915_private*dev_priv, const struct inteldrivers/gpu/drm/i915/display/intel_bw.c +11
-29break ; } +/* +* 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 ; }@@ -259,7 +292,7 @@ static unsigned int icl_max_bw(struct drm_i915_private *dev_priv, if (qgv_point >= bi->num_qgv_points)return UINT_MAX ; -if (num_planes >= bi->num_planes) +if (num_planes >= bi->num_planes || !num_planes)return bi->deratedbw[qgv_point]; }@@ -277,34 +310,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)
{drivers/gpu/drm/i915/display/intel_bw.c +7
-2/* @@ -418,11 +423,16 @@ 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 ; -unsigned int data_rate, max_data_rate; +struct intel_bw_state *new_bw_state =NULL ; +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 ;drivers/gpu/drm/i915/display/intel_bw.c +0
-0/* * For earlier Gens let's consider bandwidth changed if ddb requirements,
drivers/gpu/drm/i915/display/intel_bw.c int intel_bw_atomic_check(struct · line 446
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_bw.c +3
-3@@ -430,11 +440,11 @@ int intel_bw_atomic_check(structintel_atomic_state *state) */ if (INTEL_GEN (dev_priv) <11 ) {if (state->ddb_state_changed) { - bw_state =intel_bw_get_state (state); -if (IS_ERR (bw_state)) -return PTR_ERR (bw_state); + new_bw_state =intel_bw_get_state (state); +if (IS_ERR (new_bw_state)) +return PTR_ERR (new_bw_state);Lot's of rename noise in the patch. Can't really see what's going on unless those are split out.
Quoted 194 lines
drivers/gpu/drm/i915/display/intel_bw.c +1
-1- ret =intel_atomic_lock_global_state (&bw_state- >base); + ret =intel_atomic_lock_global_state (&new_bw_state->base);if (ret)drivers/gpu/drm/i915/display/intel_bw.c +35
-20return ret;@@ -465,45 +475,107 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) old_active_planes == new_active_planes) continue; - bw_state =intel_bw_get_state (state); -if (IS_ERR (bw_state)) -return PTR_ERR (bw_state); + new_bw_state =intel_bw_get_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); -if (ret) + ret =intel_atomic_lock_global_state (&new_bw_state->base); +if (ret) { +DRM_DEBUG_KMS ("Could not lock global state\n" );return ret; + } -DRM_DEBUG_KMS ("Marking bw state changed for atomic state %p\n" , state); - - state->bw_state_changed = true; + data_rate =intel_bw_data_rate (dev_priv, new_bw_state); + data_rate =DIV_ROUND_UP (data_rate,1000 ); - data_rate =intel_bw_data_rate (dev_priv, bw_state); - num_active_planes =intel_bw_num_active_planes (dev_priv, 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); +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 %dMB/s (%d active planes)\n",
drivers/gpu/drm/i915/display/intel_bw.c +0
-1- data_rate, max_data_rate,
num_active_planes);drivers/gpu/drm/i915/display/intel_bw.c +2
-0+/* +* BSpec states that we always should have at least one allowed point
drivers/gpu/drm/i915/display/intel_bw.c +1
-0+* left, so if we couldn't - simply reject the configuration for obvious
drivers/gpu/drm/i915/display/intel_bw.c +5
-0+* reasons. +*/ + if (allowed_points == 0) { + DRM_DEBUG_KMS("No QGV points provide sufficient memory" + " bandwidth for displayconfiguration.\n");
drivers/gpu/drm/i915/display/intel_bw.c +3
-0return -EINVAL ; } +/* +* Leave only single point with highest bandwidth, if +* we can't enable SAGV due to the increased memory latency it may
drivers/gpu/drm/i915/display/intel_bw.c +9
-0+* cause. +*/ +if (!intel_can_enable_sagv_for_state (state)) { + allowed_points =1 << 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
drivers/gpu/drm/i915/display/intel_bw.c +16
-0+* actually accepts as a parameter. +*/ + new_bw_state->qgv_points_mask = (~allowed_points) & mask; + +DRM_DEBUG_KMS ("New state %p qgv mask %x\n" , + state, new_bw_state->qgv_points_mask); + + old_bw_state =intel_bw_get_old_state (state); +if (IS_ERR (old_bw_state)) { +DRM_DEBUG_KMS ("Could not get old bw state!\n" ); +return PTR_ERR (old_bw_state); + } + +/* +* If the actual mask had changed we need to make sure that +* the commits are serialized(in case this is a nomodeset, nonblocking)
drivers/gpu/drm/i915/display/intel_bw.c +2
-0+*/ + if (new_bw_state->qgv_points_mask != old_bw_state-Quoted 1 line
qgv_points_mask) {drivers/gpu/drm/i915/display/intel_bw.c +1
-0+ ret =
intel_atomic_serialize_global_state(&new_bw_state->base);drivers/gpu/drm/i915/display/intel_bw.c +2
-0+if (ret) { + DRM_DEBUG_KMS("Could not serialize globalstate\n");
drivers/gpu/drm/i915/display/intel_bw.c +4
-0+return ret; + } + + DRM_DEBUG_KMS("Marking bw state changed for atomicstate %p\n", state);
drivers/gpu/drm/i915/display/intel_bw.c +3
-0+ state->bw_state_changed = true; + } +return 0 ; }drivers/gpu/drm/i915/display/intel_bw.h +9
-0@@ -36,6 +36,13 @@ struct intel_bw_state {*/ bool can_sagv; +/* +* 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 ]; };@@ -56,5 +63,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.c +0
-0drivers/gpu/drm/i915/display/intel_display.c static void · line 15509
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-0@@ -15504,6 +15504,105 @@ static void intel_atomic_cleanup_work(struct work_struct *work)intel_atomic_helper_free_state (i915); } +static void intel_qgv_points_mask (struct intel_atomic_state *state)I think we should move these next to the other sagv code and just call them somehting like intel_sagv_{pre,post}_plane_update() to
a) avoid the caller having to know anything about them, b) match the pattern used for other similar things.And I think the internals should just be something like:
intel_sagv_pre/post_plane_update(){ new_bw_state = get_new_bw_state(); old_bw_state = get_old_bw_state(); if (!new_bw_state || new_bw_state->sagv_mask == old_bw_state->sagv_mask) return; do the pcode dance }
Quoted 2 lines
I don't see a need for any more checks than than because that would just mean that
bw_check()is broken and needs to be fixed.
Those are actually qgv points mask, also you _have to_ do some other checks - for example when we are masking qgv points - it means we can only mask those however for example transition 0x001 (qgv point 0 masked) to 0x000(new mask), means that there is nothing to mask here and moreover it will be wrong to call PCode at this point.
Stan
Quoted 178 lines
Quoted 178 lines
drivers/gpu/drm/i915/display/intel_display.c +23
-0+{ +struct drm_device *dev = state->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +int ret; +struct intel_bw_state *new_bw_state =NULL ; +struct intel_bw_state *old_bw_state =NULL ; +u32 new_mask =0 ; +unsigned int num_qgv_points = dev_priv- >max_bw[0].num_qgv_points; +unsigned int mask = (1 << num_qgv_points) -1 ; + + new_bw_state =intel_bw_get_state (state); +if (IS_ERR (new_bw_state)) { +WARN (1 ,"Could not get new bw_state!\n" ); +return ; + } + + old_bw_state =intel_bw_get_old_state (state); +if (IS_ERR (old_bw_state)) { +WARN (1 ,"Could not get old bw_state!\n" ); +return ; + } + + new_mask = old_bw_state->qgv_points_mask | new_bw_state-Quoted 1 line
qgv_points_mask;drivers/gpu/drm/i915/display/intel_display.c +18
-0+ +/* +* If new mask is zero - means there is nothing to mask, +* we can only unmask, which should be done in unmask. +*/ +if (!new_mask) +return ; + +WARN_ON (new_mask == mask); + +/* +* Just return if we can't control SAGV or don't have it. +*/ +if (!intel_has_sagv (dev_priv)) +return ; + +/* +* Restrict required qgv points before updating the configuration.
drivers/gpu/drm/i915/display/intel_display.c +1
-0+* According to BSpec we can't mask and unmask qgv points at the same
drivers/gpu/drm/i915/display/intel_display.c +1
-0+* time. Also masking should be done before updating the configuration
drivers/gpu/drm/i915/display/intel_display.c +5
-0+* and unmasking afterwards. +*/ + ret =icl_pcode_restrict_qgv_points (dev_priv, new_mask); +if (ret <0 ) + DRM_DEBUG_KMS("Could not mask required qgvpoints(%d)\n",
drivers/gpu/drm/i915/display/intel_display.c +4
-0+ ret); +} + +static void intel_qgv_points_unmask(struct intel_atomic_state*state)
drivers/gpu/drm/i915/display/intel_display.c +37
-0+{ +struct drm_device *dev = state->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +int ret; +struct intel_bw_state *new_bw_state =NULL ; +struct intel_bw_state *old_bw_state =NULL ; +u32 new_mask =0 ; + + new_bw_state =intel_bw_get_state (state); +if (IS_ERR (new_bw_state)) { +WARN (1 ,"Could not get new bw_state!\n" ); +return ; + } + + old_bw_state =intel_bw_get_old_state (state); +if (IS_ERR (old_bw_state)) { +WARN (1 ,"Could not get new bw_state!\n" ); +return ; + } + + new_mask = new_bw_state->qgv_points_mask; + +/* +* Just return if we can't control SAGV or don't have it. +*/ +if (!intel_has_sagv (dev_priv)) +return ; + +/* +* Nothing to unmask +*/ +if (new_mask == old_bw_state->qgv_points_mask) +return ; + +/* +* Allow required qgv points after updating the configuration. +* According to BSpec we can't mask and unmask qgv points at the same
drivers/gpu/drm/i915/display/intel_display.c +1
-0+* time. Also masking should be done before updating the configuration
drivers/gpu/drm/i915/display/intel_display.c +5
-0+* and unmasking afterwards. +*/ + ret =icl_pcode_restrict_qgv_points (dev_priv, new_mask); +if (ret <0 ) + DRM_DEBUG_KMS("Could not unmask required qgvpoints(%d)\n",
drivers/gpu/drm/i915/display/intel_display.c +3
-0+ ret); +} + static void intel_atomic_commit_tail(struct intel_atomic_state*state)
{drivers/gpu/drm/i915/display/intel_display.c +2
-0struct drm_device *dev = state->base.dev;@@ -15537,6 +15636,15 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) crtc->config = new_crtc_state; +/* +* Now we need to check if SAGV needs to be disabled(i.e QGV points
drivers/gpu/drm/i915/display/intel_display.c +1
-0+* modified even, when no modeset is done(for example plane updates
drivers/gpu/drm/i915/display/intel_display.c +6
-0+* can now trigger that). +*/ +if ((INTEL_GEN (dev_priv) >=11 )) +if (state->bw_state_changed) +intel_qgv_points_mask (state); +if (state->modeset) { drm_atomic_helper_update_legacy_modeset_state(dev,
&state->base);drivers/gpu/drm/i915/display/intel_display.c +0
-0@@ -15546,12 +15654,9 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) * SKL workaround: bspec recommends we disable the SAGVwhen we
drivers/gpu/drm/i915/display/intel_display.c +7
-10* have more then one pipe enabled */ -if (INTEL_GEN (dev_priv) <11 ) { -if (state->bw_state_changed) { -if (!intel_can_enable_sagv (dev_priv)) -intel_disable_sagv (dev_priv); - } - } +if ((INTEL_GEN (dev_priv) <11 )) +if (!intel_can_enable_sagv (dev_priv)) +intel_disable_sagv (dev_priv);intel_modeset_verify_disabled (dev_priv, state); }@@ -15652,10 +15757,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_verify_planes (state);if (INTEL_GEN (dev_priv) <11 ) { -if (state->bw_state_changed) { -if (intel_can_enable_sagv (dev_priv)) -intel_enable_sagv (dev_priv); - } +if (intel_can_enable_sagv (dev_priv)) +intel_enable_sagv (dev_priv); + }else if (state->bw_state_changed) { +intel_qgv_points_unmask (state); }drivers/gpu/drm/i915/display/intel_display.c +0
-0drm_atomic_helper_commit_hw_done (&state->base);drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -841,6 +841,9 @@ enum intel_pipe_crc_source { INTEL_PIPE_CRC_SOURCE_MAX, };
Quoted 10 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +3
-0+/* BSpec precisely defines this */ +#define NUM_SAGV_POINTS 8 +#define INTEL_PIPE_CRC_ENTRIES_NR 128struct intel_pipe_crc {spinlock_t lock;Signature · 1 line
2.24.1.485.gad05a3d8e5
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v18 8/8 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
@@ -3624,10 +3624,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.CHECKPATCH: warning for Refactor Gen11+ SAGV support
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: Refactor Gen11+ SAGV support
URL : https://patchwork.freedesktop.org/series/73856/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 658365e95a33 drm/i915: Start passing latency as parameter ba654cc920d4 drm/i915: Introduce skl_plane_wm_level accessor. b339bbdf676c drm/i915: Add intel_bw_get_*_state helpers 4d3ce9ab4bc3 drm/i915: Introduce more *_state_changed indicators 1a4b8e91ea4b drm/i915: Refactor intel_can_enable_sagv -:357: CHECK:BOOL_COMPARISON: Using comparison to false is error prone #357: FILE: drivers/gpu/drm/i915/intel_pm.c:3863: + if (state->active_pipe_changes == 0 && state->ddb_state_changed == false)
-:394: CHECK:BRACES: Blank lines aren't necessary after an open brace '{' #394: FILE: drivers/gpu/drm/i915/intel_pm.c:3900:
+ if (new_bw_state->pipe_sagv_mask != old_bw_state->pipe_sagv_mask) {
+
total: 0 errors, 0 warnings, 2 checks, 720 lines checked 95a34afc3826 drm/i915: Added required new PCode commands d9e474c18262 drm/i915: Restrict qgv points which don't have enough bandwidth. -:357: CHECK:BRACES: Blank lines aren't necessary after an open brace '{' #357: FILE: drivers/gpu/drm/i915/display/intel_bw.c:557:
+ if (new_bw_state->qgv_points_mask != old_bw_state->qgv_points_mask) {
+
total: 0 errors, 0 warnings, 1 checks, 406 lines checked a8667395977a drm/i915: Enable SAGV support for Gen12
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Refactor Gen11+ SAGV support
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: Refactor Gen11+ SAGV support
URL : https://patchwork.freedesktop.org/series/73856/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.6.0 Commit: drm/i915: Start passing latency as parameter Okay!
Commit: drm/i915: Introduce skl_plane_wm_level accessor. Okay!
Commit: drm/i915: Add intel_bw_get_*_state helpers Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for Refactor Gen11+ SAGV support
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: Refactor Gen11+ SAGV support
URL : https://patchwork.freedesktop.org/series/73856/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7998 -> Patchwork_16691
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_16691 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_16691, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_16691:
### IGT changes ###
#### Possible regressions ####
* igt@kms_force_connector_basic@force-connector-state:
- fi-kbl-guc: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7998/fi-kbl-guc/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/fi-kbl-guc/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* {igt@kms_busy@basic@flip}:
- fi-skl-guc: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7998/fi-skl-guc/igt@kms_busy@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/fi-skl-guc/igt@kms_busy@[email protected]
- fi-skl-6700k2: [PASS][5] -> [INCOMPLETE][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7998/fi-skl-6700k2/igt@kms_busy@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/fi-skl-6700k2/igt@kms_busy@[email protected]
Known issues
------------
Here are the changes found in Patchwork_16691 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_close_race@basic-threads:
- fi-byt-j1900: [PASS][7] -> [INCOMPLETE][8] ([i915#45])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7998/fi-byt-j1900/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/fi-byt-j1900/igt@[email protected]
- fi-byt-n2820: [PASS][9] -> [INCOMPLETE][10] ([i915#45])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7998/fi-byt-n2820/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/fi-byt-n2820/igt@[email protected]
* igt@gem_exec_suspend@basic-s4-devices:
- fi-tgl-y: [PASS][11] -> [FAIL][12] ([CI#94])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7998/fi-tgl-y/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/fi-tgl-y/igt@[email protected]
* igt@kms_chamelium@hdmi-crc-fast:
- fi-icl-u2: [PASS][13] -> [FAIL][14] ([fdo#109635] / [i915#217])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7998/fi-icl-u2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/fi-icl-u2/igt@[email protected]
* igt@prime_vgem@basic-fence-wait-default:
- fi-tgl-y: [PASS][15] -> [DMESG-WARN][16] ([CI#94] / [i915#402]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7998/fi-tgl-y/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/fi-tgl-y/igt@[email protected]
#### Possible fixes ####
* igt@gem_flink_basic@basic:
- fi-tgl-y: [DMESG-WARN][17] ([CI#94] / [i915#402]) -> [PASS][18] +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7998/fi-tgl-y/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/fi-tgl-y/igt@[email protected]
#### Warnings ####
* igt@gem_close_race@basic-threads:
- fi-hsw-peppy: [INCOMPLETE][19] ([i915#694] / [i915#816]) -> [TIMEOUT][20] ([fdo#112271] / [i915#1084])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7998/fi-hsw-peppy/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/fi-hsw-peppy/igt@[email protected]
* igt@runner@aborted:
- fi-byt-j1900: [FAIL][21] ([i915#999]) -> [FAIL][22] ([i915#816])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7998/fi-byt-j1900/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/fi-byt-j1900/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[CI#94]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/94
[fdo#109635]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
[fdo#112271]: https://bugs.freedesktop.org/show_bug.cgi?id=112271
[i915#1084]: https://gitlab.freedesktop.org/drm/intel/issues/1084
[i915#1233]: https://gitlab.freedesktop.org/drm/intel/issues/1233
[i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
[i915#283]: https://gitlab.freedesktop.org/drm/intel/issues/283
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#45]: https://gitlab.freedesktop.org/drm/intel/issues/45
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#816]: https://gitlab.freedesktop.org/drm/intel/issues/816
[i915#999]: https://gitlab.freedesktop.org/drm/intel/issues/999
Participating hosts (51 -> 31)
------------------------------
Missing (20): fi-kbl-soraka fi-ilk-m540 fi-bxt-dsi fi-hsw-4200u fi-glk-dsi fi-byt-squawks fi-cfl-8700k fi-apl-guc fi-kbl-7500u fi-ctg-p8600 fi-bsw-cyan fi-cfl-guc fi-kbl-x1275 fi-cfl-8109u fi-elk-e7500 fi-bsw-kefka fi-skl-lmem fi-byt-clapper fi-skl-6600u fi-kbl-r
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7998 -> Patchwork_16691
CI-20190529: 20190529
CI_DRM_7998: 7b1bb0188905d180ee11694d9c26c5dd656dc1d1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5463: d519c80219ebe558cd2fa378f26f9d73f9e35310 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16691: a8667395977a27778af8d856121fa030866e3028 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
a8667395977a drm/i915: Enable SAGV support for Gen12d9e474c18262 drm/i915: Restrict qgv points which don't have enough bandwidth. 95a34afc3826 drm/i915: Added required new PCode commands 1a4b8e91ea4b drm/i915: Refactor intel_can_enable_sagv 4d3ce9ab4bc3 drm/i915: Introduce more *_state_changed indicators b339bbdf676c drm/i915: Add intel_bw_get_*_state helpers ba654cc920d4 drm/i915: Introduce skl_plane_wm_level accessor. 658365e95a33 drm/i915: Start passing latency as parameter
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16691/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Refactor Gen11+ SAGV support (rev5)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: Refactor Gen11+ SAGV support (rev5)
URL : https://patchwork.freedesktop.org/series/73856/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip a9bdbd2c7c9d drm/i915: Start passing latency as parameter c0db4cbaa46c drm/i915: Introduce skl_plane_wm_level accessor. dcf925de4a6c drm/i915: Add intel_bw_get_*_state helpers 7983f49f5fc4 drm/i915: Introduce more *_state_changed indicators 3ffbee21ace8 drm/i915: Refactor intel_can_enable_sagv -:804: CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'state->active_pipe_changes != 0' #804: FILE: drivers/gpu/drm/i915/intel_pm.c:6184: + if ((state->active_pipe_changes != 0) || state->ddb_state_changed)
total: 0 errors, 0 warnings, 1 checks, 680 lines checked ca0b8463a323 drm/i915: Added required new PCode commands e819fd5ee1d8 drm/i915: Restrict qgv points which don't have enough bandwidth. 467a14ba6c89 drm/i915: Enable SAGV support for Gen12
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Refactor Gen11+ SAGV support (rev5)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: Refactor Gen11+ SAGV support (rev5)
URL : https://patchwork.freedesktop.org/series/73856/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.6.0 Commit: drm/i915: Start passing latency as parameter Okay!
Commit: drm/i915: Introduce skl_plane_wm_level accessor. Okay!
Commit: drm/i915: Add intel_bw_get_*_state helpers Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for Refactor Gen11+ SAGV support (rev5)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: Refactor Gen11+ SAGV support (rev5)
URL : https://patchwork.freedesktop.org/series/73856/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8008 -> Patchwork_16717
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_16717 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_16717, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16717/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_16717:
### IGT changes ###
#### Possible regressions ####
* igt@kms_force_connector_basic@force-connector-state:
- fi-kbl-guc: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8008/fi-kbl-guc/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16717/fi-kbl-guc/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* {igt@kms_busy@basic@flip}:
- fi-skl-guc: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8008/fi-skl-guc/igt@kms_busy@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16717/fi-skl-guc/igt@kms_busy@[email protected]
- fi-skl-6700k2: [PASS][5] -> [INCOMPLETE][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8008/fi-skl-6700k2/igt@kms_busy@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16717/fi-skl-6700k2/igt@kms_busy@[email protected]
Known issues
------------
Here are the changes found in Patchwork_16717 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_flink_basic@basic:
- fi-tgl-y: [PASS][7] -> [DMESG-WARN][8] ([CI#94] / [i915#402]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8008/fi-tgl-y/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16717/fi-tgl-y/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live_execlists:
- fi-icl-y: [DMESG-FAIL][9] ([fdo#108569]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8008/fi-icl-y/igt@i915_selftest@live_execlists.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16717/fi-icl-y/igt@i915_selftest@live_execlists.html
* igt@prime_self_import@basic-llseek-bad:
- fi-tgl-y: [DMESG-WARN][11] ([CI#94] / [i915#402]) -> [PASS][12] +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8008/fi-tgl-y/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16717/fi-tgl-y/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[CI#94]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/94
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[i915#283]: https://gitlab.freedesktop.org/drm/intel/issues/283
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
Participating hosts (52 -> 29)
------------------------------
Additional (1): fi-byt-n2820
Missing (24): fi-kbl-soraka fi-skl-6770hq fi-apl-guc fi-skl-lmem fi-skl-6600u fi-bxt-dsi fi-bsw-n3050 fi-glk-dsi fi-bwr-2160 fi-kbl-7500u fi-ctg-p8600 fi-ivb-3770 fi-bsw-nick fi-kbl-r fi-ilk-m540 fi-cfl-8700k fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-cfl-guc fi-kbl-x1275 fi-cfl-8109u fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8008 -> Patchwork_16717
CI-20190529: 20190529
CI_DRM_8008: 13b6e2575f2c05722679bc1c9d0b97c13bde49a1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5469: 4f875016eb1ebc211b8aadb280ae16c7e6cdc8ba @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16717: 467a14ba6c894306981af6d47fceac533e873f30 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
467a14ba6c89 drm/i915: Enable SAGV support for Gen12e819fd5ee1d8 drm/i915: Restrict qgv points which don't have enough bandwidth. ca0b8463a323 drm/i915: Added required new PCode commands 3ffbee21ace8 drm/i915: Refactor intel_can_enable_sagv 7983f49f5fc4 drm/i915: Introduce more *_state_changed indicators dcf925de4a6c drm/i915: Add intel_bw_get_*_state helpers c0db4cbaa46c drm/i915: Introduce skl_plane_wm_level accessor. a9bdbd2c7c9d drm/i915: Start passing latency as parameter
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16717/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Refactor Gen11+ SAGV support (rev6)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: Refactor Gen11+ SAGV support (rev6)
URL : https://patchwork.freedesktop.org/series/73856/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip a72659eb4666 drm/i915: Start passing latency as parameter 81ddfe1ca471 drm/i915: Introduce skl_plane_wm_level accessor. bb8fb326c38f drm/i915: Add intel_bw_get_*_state helpers 1f6cb30bce42 drm/i915: Introduce more *_state_changed indicators 0aad2ca03244 drm/i915: Refactor intel_can_enable_sagv -:806: CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'state->active_pipe_changes != 0' #806: FILE: drivers/gpu/drm/i915/intel_pm.c:6183: + if ((state->active_pipe_changes != 0) || state->ddb_state_changed)
total: 0 errors, 0 warnings, 1 checks, 679 lines checked 8b626dac4931 drm/i915: Added required new PCode commands 227852eaaaf7 drm/i915: Restrict qgv points which don't have enough bandwidth. 92ef8dc6a4f2 drm/i915: Enable SAGV support for Gen12
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Refactor Gen11+ SAGV support (rev6)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: Refactor Gen11+ SAGV support (rev6)
URL : https://patchwork.freedesktop.org/series/73856/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.6.0 Commit: drm/i915: Start passing latency as parameter Okay!
Commit: drm/i915: Introduce skl_plane_wm_level accessor. Okay!
Commit: drm/i915: Add intel_bw_get_*_state helpers Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Refactor Gen11+ SAGV support (rev6)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: Refactor Gen11+ SAGV support (rev6)
URL : https://patchwork.freedesktop.org/series/73856/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8018 -> Patchwork_16732
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/index.html
Known issues
------------
Here are the changes found in Patchwork_16732 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_busy@basic@flip:
- fi-skl-guc: [PASS][1] -> [DMESG-WARN][2] ([i915#88]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/fi-skl-guc/igt@kms_busy@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/fi-skl-guc/igt@kms_busy@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-cml-s: [PASS][3] -> [DMESG-WARN][4] ([i915#95]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/fi-cml-s/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/fi-cml-s/igt@[email protected]
- fi-cml-u2: [PASS][5] -> [DMESG-WARN][6] ([i915#95]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/fi-cml-u2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/fi-cml-u2/igt@[email protected]
- fi-kbl-7500u: [PASS][7] -> [DMESG-WARN][8] ([i915#93] / [i915#95]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/fi-kbl-7500u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/fi-kbl-7500u/igt@[email protected]
- fi-cfl-8109u: [PASS][9] -> [DMESG-WARN][10] ([i915#95]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/fi-cfl-8109u/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/fi-cfl-8109u/igt@[email protected]
#### Possible fixes ####
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][11] ([fdo#111096] / [i915#323]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/fi-kbl-7500u/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/fi-kbl-7500u/igt@[email protected]
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[i915#323]: https://gitlab.freedesktop.org/drm/intel/issues/323
[i915#88]: https://gitlab.freedesktop.org/drm/intel/issues/88
[i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (49 -> 41)
------------------------------
Additional (1): fi-byt-n2820
Missing (9): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-kbl-x1275 fi-skl-lmem fi-tgl-y fi-bdw-samus fi-kbl-r
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8018 -> Patchwork_16732
CI-20190529: 20190529
CI_DRM_8018: d2d7fd43fafd159b7d9d957340e4ed9775ab20b0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5473: d22b3507ff2678a05d69d47c0ddf6f0e72ee7ffd @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16732: 92ef8dc6a4f25ddc463b7cc74d4dfafe8913e708 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
92ef8dc6a4f2 drm/i915: Enable SAGV support for Gen12227852eaaaf7 drm/i915: Restrict qgv points which don't have enough bandwidth. 8b626dac4931 drm/i915: Added required new PCode commands 0aad2ca03244 drm/i915: Refactor intel_can_enable_sagv 1f6cb30bce42 drm/i915: Introduce more *_state_changed indicators bb8fb326c38f drm/i915: Add intel_bw_get_*_state helpers 81ddfe1ca471 drm/i915: Introduce skl_plane_wm_level accessor. a72659eb4666 drm/i915: Start passing latency as parameter
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for Refactor Gen11+ SAGV support (rev6)
In reply to Stanislav Lisovskiy== Series Details ==
== Series Details ==
Series: Refactor Gen11+ SAGV support (rev6)
URL : https://patchwork.freedesktop.org/series/73856/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8018_full -> Patchwork_16732_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_16732_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_16732_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_16732_full:
### IGT changes ###
#### Possible regressions ####
* igt@debugfs_test@read_all_entries_display_on:
- shard-glk: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-glk6/igt@debugfs_test@read_all_entries_display_on.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-glk1/igt@debugfs_test@read_all_entries_display_on.html
* igt@kms_cursor_crc@pipe-a-cursor-256x85-onscreen:
- shard-skl: [PASS][3] -> [INCOMPLETE][4] +6 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-skl9/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-skl1/igt@[email protected]
* igt@kms_rotation_crc@sprite-rotation-180:
- shard-tglb: NOTRUN -> [INCOMPLETE][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb5/igt@[email protected]
* igt@kms_rotation_crc@sprite-rotation-270:
- shard-tglb: [PASS][6] -> [INCOMPLETE][7] +10 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-tglb2/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb5/igt@[email protected]
* igt@runner@aborted:
- shard-tglb: NOTRUN -> ([FAIL][8], [FAIL][9], [FAIL][10], [FAIL][11], [FAIL][12], [FAIL][13], [FAIL][14], [FAIL][15], [FAIL][16], [FAIL][17], [FAIL][18], [FAIL][19], [FAIL][20])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb7/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb8/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb2/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb5/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb6/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb5/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb7/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb8/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb3/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb6/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb5/igt@[email protected]
#### Warnings ####
* igt@runner@aborted:
- shard-kbl: [FAIL][21] ([i915#92]) -> ([FAIL][22], [FAIL][23], [FAIL][24], [FAIL][25], [FAIL][26], [FAIL][27], [FAIL][28], [FAIL][29], [FAIL][30], [FAIL][31], [FAIL][32], [FAIL][33], [FAIL][34], [FAIL][35]) ([fdo#109383] / [fdo#111012] / [i915#92])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-kbl6/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl7/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl6/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl7/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl4/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl6/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl1/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl7/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl4/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl6/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl4/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl3/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl2/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl2/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl1/igt@[email protected]
- shard-apl: [FAIL][36] ([fdo#103927]) -> ([FAIL][37], [FAIL][38], [FAIL][39], [FAIL][40], [FAIL][41], [FAIL][42], [FAIL][43], [FAIL][44]) ([fdo#103927] / [i915#211])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-apl7/igt@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl6/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl3/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl3/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl7/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl8/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl8/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl8/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl1/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_8018_full and Patchwork_16732_full:
### New IGT tests (4) ###
* igt@drm_mm@all:
- Statuses :
- Exec time: [None] s
* igt@i915_selftest@mock:
- Statuses :
- Exec time: [None] s
* igt@i915_selftest@perf:
- Statuses :
- Exec time: [None] s
* igt@kms_selftest@all:
- Statuses :
- Exec time: [None] s
Known issues
------------
Here are the changes found in Patchwork_16732_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_schedule@implicit-read-write-bsd2:
- shard-iclb: [PASS][45] -> [SKIP][46] ([fdo#109276] / [i915#677])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb1/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb3/igt@[email protected]
* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [PASS][47] -> [SKIP][48] ([fdo#112146]) +3 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb7/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb4/igt@[email protected]
* igt@i915_pm_rps@reset:
- shard-iclb: [PASS][49] -> [FAIL][50] ([i915#413]) +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb3/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb1/igt@[email protected]
* igt@kms_atomic_transition@plane-all-modeset-transition:
- shard-kbl: [PASS][51] -> [INCOMPLETE][52] ([fdo#103665] / [i915#639])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-kbl4/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl2/igt@[email protected]
* igt@kms_atomic_transition@plane-all-modeset-transition-fencing:
- shard-apl: [PASS][53] -> [INCOMPLETE][54] ([fdo#103927]) +6 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-apl1/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl8/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-skl: [PASS][55] -> [INCOMPLETE][56] ([i915#300])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-skl3/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-skl2/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-64x64-onscreen:
- shard-skl: [PASS][57] -> [FAIL][58] ([i915#54])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-skl3/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-skl7/igt@[email protected]
* igt@kms_cursor_legacy@all-pipes-torture-move:
- shard-skl: [PASS][59] -> [INCOMPLETE][60] ([i915#69])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-skl8/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-skl9/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-kbl: [PASS][61] -> [INCOMPLETE][62] ([fdo#103665]) +11 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-kbl3/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl2/igt@[email protected]
- shard-skl: [PASS][63] -> [FAIL][64] ([IGT#5]) +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-skl5/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-skl5/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb8888-blt-ytiled:
- shard-glk: [PASS][65] -> [DMESG-FAIL][66] ([i915#118] / [i915#54] / [i915#95]) +16 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-glk6/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-glk2/igt@[email protected]
* igt@kms_draw_crc@fill-fb:
- shard-glk: [PASS][67] -> [DMESG-FAIL][68] ([i915#118] / [i915#95])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-glk6/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-glk4/igt@[email protected]
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-apl: [PASS][69] -> [DMESG-WARN][70] ([i915#180]) +1 similar issue
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-apl8/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl2/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack:
- shard-glk: [PASS][71] -> [DMESG-WARN][72] ([i915#118] / [i915#95]) +42 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-glk7/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-glk9/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-mmap-cpu:
- shard-glk: [PASS][73] -> [DMESG-FAIL][74] ([i915#118] / [i915#49] / [i915#95]) +7 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-glk8/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-mmap-cpu.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-glk2/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-mmap-cpu.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][75] -> [FAIL][76] ([i915#1188]) +1 similar issue
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-skl10/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-skl10/igt@[email protected]
* igt@kms_plane@pixel-format-pipe-a-planes:
- shard-skl: [PASS][77] -> [INCOMPLETE][78] ([i915#648])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-skl6/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-skl2/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][79] -> [FAIL][80] ([fdo#108145] / [i915#265])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-skl2/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-skl2/igt@[email protected]
* igt@kms_plane_cursor@pipe-a-overlay-size-256:
- shard-glk: [PASS][81] -> [INCOMPLETE][82] ([i915#58] / [k.org#198133]) +12 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-glk7/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-glk6/igt@[email protected]
- shard-skl: [PASS][83] -> [INCOMPLETE][84] ([i915#198])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-skl9/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-skl1/igt@[email protected]
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][85] -> [SKIP][86] ([fdo#109441]) +2 similar issues
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb7/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_rotation_crc@primary-y-tiled-reflect-x-270:
- shard-tglb: [PASS][87] -> [INCOMPLETE][88] ([i915#750])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-tglb8/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb7/igt@[email protected]
* igt@kms_setmode@basic:
- shard-apl: [PASS][89] -> [FAIL][90] ([i915#31])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-apl2/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl1/igt@[email protected]
- shard-kbl: [PASS][91] -> [FAIL][92] ([i915#31])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-kbl2/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl4/igt@[email protected]
* igt@perf_pmu@busy-accuracy-2-vcs1:
- shard-iclb: [PASS][93] -> [SKIP][94] ([fdo#112080]) +5 similar issues
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb2/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb7/igt@[email protected]
* igt@prime_vgem@fence-wait-bsd2:
- shard-iclb: [PASS][95] -> [SKIP][96] ([fdo#109276]) +14 similar issues
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb2/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb7/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [SKIP][97] ([fdo#110841]) -> [PASS][98]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb2/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb7/igt@[email protected]
* igt@gem_ctx_shared@q-independent-blt:
- shard-tglb: [FAIL][99] -> [PASS][100]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-tglb7/igt@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb2/igt@[email protected]
* igt@gem_exec_schedule@implicit-write-read-bsd1:
- shard-iclb: [SKIP][101] ([fdo#109276] / [i915#677]) -> [PASS][102] +1 similar issue
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb3/igt@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb1/igt@[email protected]
* igt@gem_exec_schedule@out-order-bsd2:
- shard-iclb: [SKIP][103] ([fdo#109276]) -> [PASS][104] +13 similar issues
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb3/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb1/igt@[email protected]
* igt@gem_exec_schedule@pi-distinct-iova-bsd:
- shard-iclb: [SKIP][105] ([i915#677]) -> [PASS][106] +3 similar issues
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb2/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb7/igt@[email protected]
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [SKIP][107] ([fdo#112146]) -> [PASS][108] +5 similar issues
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb2/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb7/igt@[email protected]
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-apl: [FAIL][109] ([i915#644]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-apl6/igt@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl3/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-kbl: [DMESG-WARN][111] ([i915#180]) -> [PASS][112]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-kbl2/igt@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-kbl1/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-256x85-offscreen:
- shard-skl: [FAIL][113] ([i915#54]) -> [PASS][114]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-skl3/igt@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-skl7/igt@[email protected]
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [SKIP][115] ([fdo#109441]) -> [PASS][116] +2 similar issues
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb4/igt@kms_psr@psr2_no_drrs.html
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-apl: [DMESG-WARN][117] ([i915#180]) -> [PASS][118] +2 similar issues
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-apl4/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-apl8/igt@[email protected]
* igt@perf_pmu@busy-vcs1:
- shard-iclb: [SKIP][119] ([fdo#112080]) -> [PASS][120] +10 similar issues
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb3/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb1/igt@[email protected]
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv-switch:
- shard-iclb: [SKIP][121] ([fdo#112080]) -> [FAIL][122] ([IGT#28])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-iclb7/igt@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-iclb4/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-tglb: [FAIL][123] ([i915#454]) -> [SKIP][124] ([i915#468])
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-tglb7/igt@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-tglb2/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-glk: [FAIL][125] ([i915#899]) -> [INCOMPLETE][126] ([i915#58] / [k.org#198133])
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8018/shard-glk9/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16732/shard-glk4/igt@[email protected]
[IGT#28]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/28
[IGT#5]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/5
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109383]: https://bugs.freedesktop.org/show_bug.cgi?id=109383
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#111012]: https://bugs.freedesktop.org/show_bug.cgi?id=111012
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#211]: https://gitlab.freedesktop.org/drm/intel/issues/211
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#413]: https://gitlab.freedesktop.org/drm/intel/issues/413
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#58]: https://gitlab.freedesktop.org/drm/intel/issues/58
[i915#639]: https://gitlab.freedesktop.org/drm/intel/issues/639
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#648]: https://gitlab.freedesktop.org/drm/intel/issues/648
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#750]: https://gitlab.freedesktop.org/drm/intel/issues/750
[i915#899]: https://gitlab.freedesktop.org/drm/intel/issues/899
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8018 -> Patchwork_16732
CI-20190529: 20190529
CI_DRM_8018: d2d7fd43fafd159b7d9d957340e4ed9775ab20b0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5473: d22b3507ff2678a05d69d47c0ddf6f0e72ee7ffd @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16732: 92ef8dc6a4f25ddc463b7cc74d4dfafe8913e708 @ 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_16732/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx