drm/i915: Convert gen4- watermarks to atomic.
Subsystems (2)
cover drm/i915: Convert gen4- watermarks to atomic.
I've only compile time tested this and the series depends on Ville's gen4x watermark conversion so CI will fail to apply it.
Maarten Lankhorst (7):
drm/i915: Calculate gen3- watermarks semi-atomically. drm/i915: Program gen3- watermarks atomically drm/i915: Convert pineview watermarks to atomic drm/i915: Calculate gen4 watermarks semiatomically. drm/i915: Program gen4 watermarks atomically drm/i915: Kill off intel_crtc_active. drm/i915: Rip out legacy watermark infrastructure
drivers/gpu/drm/i915/i915_drv.h | 6 +- drivers/gpu/drm/i915/intel_atomic.c | 2 - drivers/gpu/drm/i915/intel_display.c | 97 +----- drivers/gpu/drm/i915/intel_drv.h | 18 +- drivers/gpu/drm/i915/intel_fbc.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 635 ++++++++++++++++++++++------------- 6 files changed, 433 insertions(+), 327 deletions(-)
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 1/7 drm/i915: Calculate gen3- watermarks semi-atomically.
The gen3 watermark calculations are converted to atomic, but the wm update calls are still done through the legacy functions.
This will make it easier to bisect things if they go wrong.
--- drivers/gpu/drm/i915/intel_display.c | 3 +- drivers/gpu/drm/i915/intel_drv.h | 14 +++ drivers/gpu/drm/i915/intel_pm.c | 231 +++++++++++++++++++++-------------- 3 files changed, 152 insertions(+), 96 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -1
@@ -15518,7 +15518,8 @@ intel_modeset_setup_hw_state(struct drm_device *dev)skl_wm_get_hw_state (dev); }else if (HAS_PCH_SPLIT (dev_priv)) {ilk_wm_get_hw_state (dev); - } + }else if (INTEL_GEN (dev_priv) <=3 && !IS_PINEVIEW (dev_priv)) +i9xx_wm_get_hw_state (dev);for_each_intel_crtc (dev, crtc) {u64 put_domains;
drivers/gpu/drm/i915/intel_drv.h +14 -0
@@ -546,6 +546,15 @@ struct g4x_wm_state {bool fbc_en; }; +struct i9xx_wm_state { +uint16_t plane_wm; +bool cxsr; + +struct { +uint16_t plane; + } sr; +}; + struct intel_crtc_wm_state { union { struct {
@@ -590,6 +599,9 @@ struct intel_crtc_wm_state {/* optimal watermarks */ struct g4x_wm_state optimal; } g4x; +struct { +struct i9xx_wm_state optimal; + } i9xx; };/*
@@ -828,6 +840,7 @@ struct intel_crtc {struct intel_pipe_wm ilk;struct vlv_wm_state vlv;struct g4x_wm_state g4x; +struct i9xx_wm_state i9xx; } active; } wm;
@@ -1868,6 +1881,7 @@ void gen6_rps_boost(struct drm_i915_private *dev_priv, unsigned long submitted);void intel_queue_rps_boost_for_request (struct drm_i915_gem_request *req);void g4x_wm_get_hw_state (struct drm_device *dev); +void i9xx_wm_get_hw_state (struct drm_device *dev);void vlv_wm_get_hw_state (struct drm_device *dev);void ilk_wm_get_hw_state (struct drm_device *dev);void skl_wm_get_hw_state (struct drm_device *dev);
drivers/gpu/drm/i915/intel_pm.c +136 -95
288 lines not on this page · raw message
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 2/7 drm/i915: Program gen3- watermarks atomically
In reply to Maarten LankhorstWith the atomic watermark calculations calculate intermediary watermark values and update the watermarks atomically.
--- drivers/gpu/drm/i915/i915_drv.h | 5 ++ drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_pm.c | 103 +++++++++++++++++++++++++++++++++------ 3 files changed, 95 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +5 -0
@@ -1793,6 +1793,10 @@ struct g4x_wm_values {bool fbc_en; }; +struct i9xx_wm_values { +bool cxsr; +}; +struct skl_ddb_entry {uint16_t start, end;/* in number of blocks, 'end' is exclusive */ };
@@ -2422,6 +2426,7 @@ struct drm_i915_private {struct skl_wm_values skl_hw;struct vlv_wm_values vlv;struct g4x_wm_values g4x; +struct i9xx_wm_values i9xx; };uint8_t max_level;
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -600,7 +600,7 @@ struct intel_crtc_wm_state {struct g4x_wm_state optimal; } g4x;struct { -struct i9xx_wm_state optimal; +struct i9xx_wm_state optimal, intermediate; } i9xx; };
drivers/gpu/drm/i915/intel_pm.c +89 -14
167 lines not on this page · raw message
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 3/7 drm/i915: Convert pineview watermarks to atomic
In reply to Maarten LankhorstPineview seems to have different watermarks from the other platforms and are calculated separately.
--- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_pm.c | 134 ++++++++++++++++++++++++++------------- 2 files changed, 92 insertions(+), 45 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +2 -1
@@ -552,7 +552,8 @@ struct i9xx_wm_state {struct {uint16_t plane; - } sr; +uint16_t cursor; + } sr, hpll; };struct intel_crtc_wm_state {
drivers/gpu/drm/i915/intel_pm.c +90 -44
192 lines not on this page · raw message
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 4/7 drm/i915: Calculate gen4 watermarks semiatomically.
In reply to Maarten LankhorstGen4 watermark is handled same as gen3-. Calculate the optimal watermarks atomically first, and program it in the legacy helper.
--- drivers/gpu/drm/i915/intel_pm.c | 136 ++++++++++++++++++++++++++++------------ 1 file changed, 95 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +95 -41
@@ -2189,58 +2189,109 @@ static void vlv_optimize_watermarks(struct intel_atomic_state *state,mutex_unlock (&dev_priv->wm.wm_mutex); } -static void i965_update_wm (struct intel_crtc *unused_crtc) +static int i965_compute_pipe_wm (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (unused_crtc->base.dev); -struct intel_crtc *crtc; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +struct intel_atomic_state *state = +to_intel_atomic_state (crtc_state->base.state); +struct i9xx_wm_state *wm_state = &crtc_state->wm.i9xx.optimal; +struct intel_plane *plane =to_intel_plane (crtc->base.primary); +const struct drm_plane_state *primary_plane_state =NULL ; +const struct drm_plane_state *cursor_plane_state =NULL ; + +memset (wm_state,0 ,sizeof (*wm_state)); + +if (crtc_state->base.plane_mask &BIT (drm_plane_index (&plane->base))) + primary_plane_state =__drm_atomic_get_current_plane_state (&state->base, &plane->base); + +if (crtc_state->base.plane_mask &BIT (drm_plane_index (crtc->base.cursor))) + cursor_plane_state =__drm_atomic_get_current_plane_state (&state->base, crtc->base.cursor); + +if (primary_plane_state) { +static const int sr_latency_ns =12000 ; +const struct drm_display_mode *adjusted_mode = + &crtc_state->base.adjusted_mode; +unsigned active_crtcs; +unsigned long entries; +bool may_cxsr; + +if (state->modeset) + active_crtcs = state->active_crtcs; +else + active_crtcs = dev_priv->active_crtcs; + + may_cxsr = active_crtcs ==drm_crtc_mask (&crtc->base); + +if (may_cxsr &&intel_wm_plane_visible (crtc_state,to_intel_plane_state (primary_plane_state))) { +struct drm_framebuffer *fb = primary_plane_state->fb; +unsigned cpp = fb->format->cpp[0 ]; + + entries =intel_wm_method2 (adjusted_mode->crtc_clock, + adjusted_mode->crtc_htotal, + crtc_state->pipe_src_w, cpp, + sr_latency_ns /100 ); + entries =DIV_ROUND_UP (entries,I915_FIFO_LINE_SIZE ); +if (entries <I965_FIFO_SIZE ) + wm_state->sr.plane =I965_FIFO_SIZE - entries; +else + may_cxsr = false; + +DRM_DEBUG_KMS ("self-refresh entries: %ld\n" , entries); + } + +/* No need to use intel_wm_plane_visible here, since cursor. */ +if (may_cxsr && cursor_plane_state && crtc_state->base.active) { + entries =intel_wm_method2 (adjusted_mode->crtc_clock, + adjusted_mode->crtc_htotal, + cursor_plane_state->crtc_w,4 , + sr_latency_ns /100 ); + + entries =DIV_ROUND_UP (entries, + i965_cursor_wm_info.cacheline_size) + + i965_cursor_wm_info.guard_size; + +if (entries < i965_cursor_wm_info.fifo_size) + wm_state->sr.cursor =min (i965_cursor_wm_info.fifo_size - entries, + (unsigned long )(i965_cursor_wm_info.max_wm)); +else + may_cxsr = false; + }else if (may_cxsr) + wm_state->sr.cursor =16 ; + + wm_state->cxsr = may_cxsr; + +DRM_DEBUG_KMS ("FIFO watermarks - can cxsr: %s, display plane %d, cursor SR size: %d\n" , +yesno (wm_state->cxsr), wm_state->sr.plane, wm_state->sr.cursor); + } + +return 0 ; +} + +static void i965_update_wm (struct intel_crtc *crtc) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);int srwm =1 ;int cursor_sr =16 ; -bool cxsr_enabled; +bool cxsr_enabled = false; + + crtc->wm.active.i9xx = crtc->config->wm.i9xx.optimal;/* Calc sr entries for one plane configs */ crtc =single_enabled_crtc (dev_priv); -if (crtc) { -/* self-refresh has much higher latency */ -static const int sr_latency_ns =12000 ; -const struct drm_display_mode *adjusted_mode = - &crtc->config->base.adjusted_mode; -const struct drm_framebuffer *fb = - crtc->base.primary->state->fb; -int clock = adjusted_mode->crtc_clock; -int htotal = adjusted_mode->crtc_htotal; -int hdisplay = crtc->config->pipe_src_w; -int cpp = fb->format->cpp[0 ]; -int entries; - - entries =intel_wm_method2 (clock, htotal, - hdisplay, cpp, sr_latency_ns /100 ); - entries =DIV_ROUND_UP (entries,I915_FIFO_LINE_SIZE ); - srwm =I965_FIFO_SIZE - entries; -if (srwm <0 ) - srwm =1 ; - srwm &=0x1ff ; -DRM_DEBUG_KMS ("self-refresh entries: %d, wm: %d\n" , - entries, srwm); - - entries =intel_wm_method2 (clock, htotal, - crtc->base.cursor->state->crtc_w,4 , - sr_latency_ns /100 ); - entries =DIV_ROUND_UP (entries, - i965_cursor_wm_info.cacheline_size) + - i965_cursor_wm_info.guard_size; - - cursor_sr = i965_cursor_wm_info.fifo_size - entries; -if (cursor_sr > i965_cursor_wm_info.max_wm) - cursor_sr = i965_cursor_wm_info.max_wm; +if (crtc && crtc->wm.active.i9xx.cxsr) { +struct i9xx_wm_state *wm_state = &crtc->wm.active.i9xx; + + srwm = wm_state->sr.plane; + cursor_sr = wm_state->sr.cursor;DRM_DEBUG_KMS ("self-refresh watermark: display plane %d " "cursor %d\n" , srwm, cursor_sr); cxsr_enabled = true; - }else { - cxsr_enabled = false; + }else if (dev_priv->wm.i9xx.cxsr) {/* Turn off self refresh if both pipes are enabled */ -intel_set_memory_cxsr (dev_priv, false); +_intel_set_memory_cxsr (dev_priv, false); } DRM_DEBUG_KMS("Setting FIFO watermarks - A: 8, B: 8, C: 8, SR %d\n",
@@ -2257,7 +2308,9 @@ static void i965_update_wm(struct intel_crtc *unused_crtc)I915_WRITE (DSPFW3 ,FW_WM (cursor_sr,CURSOR_SR ));if (cxsr_enabled) -intel_set_memory_cxsr (dev_priv, true); +_intel_set_memory_cxsr (dev_priv, true); + + dev_priv->wm.i9xx.cxsr = cxsr_enabled; }#undef FW_WM
@@ -8857,6 +8910,7 @@ void intel_init_pm(struct drm_i915_private *dev_priv) dev_priv->display.optimize_watermarks = i9xx_optimize_watermarks; } }else if (IS_GEN4 (dev_priv)) { + dev_priv->display.compute_pipe_wm = i965_compute_pipe_wm; dev_priv->display.update_wm = i965_update_wm; }else if (IS_GEN3 (dev_priv)) { dev_priv->display.compute_pipe_wm = i9xx_compute_pipe_wm;
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 5/7 drm/i915: Program gen4 watermarks atomically
In reply to Maarten LankhorstWe're already calculating the watermarks correctly, now we have to program them too.
--- drivers/gpu/drm/i915/intel_pm.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +15 -10
@@ -2268,20 +2268,20 @@ static int i965_compute_pipe_wm(struct intel_crtc_state *crtc_state)return 0 ; } -static void i965_update_wm (struct intel_crtc *crtc) +static void i965_program_watermarks (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +struct intel_crtc *crtc; +struct i9xx_wm_state *wm_state =NULL ;int srwm =1 ;int cursor_sr =16 ;bool cxsr_enabled = false; - crtc->wm.active.i9xx = crtc->config->wm.i9xx.optimal; - -/* Calc sr entries for one plane configs */ crtc =single_enabled_crtc (dev_priv); -if (crtc && crtc->wm.active.i9xx.cxsr) { -struct i9xx_wm_state *wm_state = &crtc->wm.active.i9xx; +if (crtc) + wm_state = &crtc->wm.active.i9xx; +/* Calc sr entries for one plane configs */ +if (wm_state && wm_state->cxsr) { srwm = wm_state->sr.plane; cursor_sr = wm_state->sr.cursor;
@@ -2571,8 +2571,10 @@ static void i9xx_initial_watermarks(struct intel_atomic_state *state,pnv_program_watermarks (dev_priv); else if (INTEL_INFO(dev_priv)->num_pipes == 1) i845_program_watermarks(intel_crtc); - else + else if (INTEL_GEN(dev_priv) < 4) i9xx_program_watermarks(dev_priv); + else +i965_program_watermarks (dev_priv );mutex_unlock (&dev_priv->wm.wm_mutex); }
@@ -2591,8 +2593,10 @@ static void i9xx_optimize_watermarks(struct intel_atomic_state *state,pnv_program_watermarks (dev_priv); else if (INTEL_INFO(dev_priv)->num_pipes == 1) i845_program_watermarks(intel_crtc); - else + else if (INTEL_GEN(dev_priv) < 4) i9xx_program_watermarks(dev_priv); + else +i965_program_watermarks (dev_priv );mutex_unlock (&dev_priv->wm.wm_mutex); }
@@ -8911,7 +8915,8 @@ void intel_init_pm(struct drm_i915_private *dev_priv) } }else if (IS_GEN4 (dev_priv)) { dev_priv->display.compute_pipe_wm = i965_compute_pipe_wm; - dev_priv->display.update_wm = i965_update_wm; + dev_priv->display.initial_watermarks = i9xx_initial_watermarks; + dev_priv->display.optimize_watermarks = i9xx_optimize_watermarks; }else if (IS_GEN3 (dev_priv)) { dev_priv->display.compute_pipe_wm = i9xx_compute_pipe_wm; dev_priv->display.compute_intermediate_wm = i9xx_compute_intermediate_wm;
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 6/7 drm/i915: Kill off intel_crtc_active.
In reply to Maarten LankhorstUse crtc->active directly instead. This is still not completely optimal and needs fixing, but it's about as good as using intel_crtc_active.
--- drivers/gpu/drm/i915/intel_display.c | 19 ------------------- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_fbc.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 6 +++--- 4 files changed, 4 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -19
@@ -948,25 +948,6 @@ bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state, int target_clock, target_clock, refclk, NULL, best_clock); } -bool intel_crtc_active (struct intel_crtc *crtc) -{ -/* Be paranoid as we can arrive here with only partial -* state retrieved from the hardware during setup. -* -* We can ditch the adjusted_mode.crtc_clock check as soon -* as Haswell has gained clock readout/fastboot support. -* -* We can ditch the crtc->primary->fb check as soon as we can -* properly reconstruct framebuffers. -* -* FIXME: The intel_crtc->active here should be switched to -* crtc->state->active once we have proper CRTC states wired up -* for atomic. -*/ -return crtc->active && crtc->base.primary->state->fb && - crtc->config->base.adjusted_mode.crtc_clock; -} -enum transcoder intel_pipe_to_cpu_transcoder (struct drm_i915_private *dev_priv,enum pipe pipe) {
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -1490,7 +1490,6 @@ bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state, int target_clock, struct dpll *best_clock);int chv_calc_dpll_params (int refclk,struct dpll *pll_clock); -bool intel_crtc_active (struct intel_crtc *crtc);void hsw_enable_ips (struct intel_crtc *crtc);void hsw_disable_ips (struct intel_crtc *crtc);enum intel_display_power_domain intel_port_to_power_domain (enum port port);
drivers/gpu/drm/i915/intel_fbc.c +1 -1
@@ -1282,7 +1282,7 @@ void intel_fbc_init_pipe_state(struct drm_i915_private *dev_priv)return ;for_each_intel_crtc (&dev_priv->drm, crtc) -if (intel_crtc_active (crtc) && +if (crtc->base.state->active && crtc->base.primary->state->visible) dev_priv->fbc.visible_pipes_mask |= (1 << crtc->pipe); }
drivers/gpu/drm/i915/intel_pm.c +3 -3
@@ -814,7 +814,7 @@ static struct intel_crtc *single_enabled_crtc(struct drm_i915_private *dev_priv)struct intel_crtc *crtc, *enabled =NULL ;for_each_intel_crtc (&dev_priv->drm, crtc) { -if (intel_crtc_active (crtc)) { +if (crtc->active) {if (enabled)return NULL ; enabled = crtc;
@@ -2486,11 +2486,11 @@ static void i9xx_program_watermarks(struct drm_i915_private *dev_priv) crtc =intel_get_crtc_for_plane (dev_priv,0 ); planea_wm = crtc->wm.active.i9xx.plane_wm; -if (intel_crtc_active (crtc)) +if (crtc->active) enabled = crtc; crtc =intel_get_crtc_for_plane (dev_priv,1 ); -if (intel_crtc_active (crtc)) { +if (crtc->active) {if (enabled ==NULL ) enabled = crtc;else
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 7/7 drm/i915: Rip out legacy watermark infrastructure
In reply to Maarten LankhorstThe legacy watermark infrastructure is now unused, so remove it.
--- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/intel_atomic.c | 2 - drivers/gpu/drm/i915/intel_display.c | 75 ++---------------------------------- drivers/gpu/drm/i915/intel_drv.h | 2 - drivers/gpu/drm/i915/intel_pm.c | 42 -------------------- 5 files changed, 3 insertions(+), 119 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -637,7 +637,6 @@ struct drm_i915_display_funcs {void (*optimize_watermarks)(struct intel_atomic_state *state,struct intel_crtc_state *cstate);int (*compute_global_watermarks)(struct drm_atomic_state *state); -void (*update_wm)(struct intel_crtc *crtc);int (*modeset_calc_cdclk)(struct drm_atomic_state *state);/* Returns the active state of the crtc, and if the crtc is active, * fills out the pipe-config with the hw state. */
drivers/gpu/drm/i915/intel_atomic.c +0 -2
@@ -173,8 +173,6 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false; - crtc_state->update_wm_pre = false; - crtc_state->update_wm_post = false; crtc_state->fb_changed = false; crtc_state->fifo_changed = false; crtc_state->wm.need_postvbl_update = false;
drivers/gpu/drm/i915/intel_display.c +3 -72
129 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +0 -2
@@ -631,7 +631,6 @@ struct intel_crtc_state {unsigned fb_bits;/* framebuffers to flip */ bool update_pipe;/* can a fast modeset be performed? */ bool disable_cxsr; -bool update_wm_pre, update_wm_post;/* watermarks are updated */ bool fb_changed;/* fb on any of the planes is changed */ bool fifo_changed;/* FIFO split is changed */
@@ -1860,7 +1859,6 @@ bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,void intel_init_clock_gating (struct drm_i915_private *dev_priv);void intel_suspend_hw (struct drm_i915_private *dev_priv);int ilk_wm_max_level (const struct drm_i915_private *dev_priv); -void intel_update_watermarks (struct intel_crtc *crtc);void intel_init_pm (struct drm_i915_private *dev_priv);void intel_init_clock_gating_hooks (struct drm_i915_private *dev_priv);void intel_pm_setup (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_pm.c +0 -42
54 lines not on this page · raw message
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx