Finally fix watermarks
Subsystems (3)
v10 cover Finally fix watermarks
Rebased version of https://patchwork.freedesktop.org/series/10276/ . No changes
Lyude (5):
drm/i915/skl: Add support for the SAGV, fix underrun hangs drm/i915/skl: Update plane watermarks atomically during plane updates drm/i915/skl: Ensure pipes with changed wms get added to the state drm/i915: Move CRTC updating in atomic_commit into it's own hook drm/i915/skl: Update DDB values atomically with wms/plane attrs
Matt Roper (1):
drm/i915/gen9: Only copy WM results for changed pipes to skl_hw
drivers/gpu/drm/i915/i915_drv.h | 4 + drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_display.c | 198 +++++++++++++++---- drivers/gpu/drm/i915/intel_drv.h | 14 ++ drivers/gpu/drm/i915/intel_pm.c | 369 ++++++++++++++++++++--------------- drivers/gpu/drm/i915/intel_sprite.c | 6 + 6 files changed, 402 insertions(+), 193 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 1/6 drm/i915/skl: Add support for the SAGV, fix underrun hangs
Since the watermark calculations for Skylake are still broken, we're apt to hitting underruns very easily under multi-monitor configurations. While it would be lovely if this was fixed, it's not. Another problem that's been coming from this however, is the mysterious issue of underruns causing full system hangs. An easy way to reproduce this with a skylake system:
- Get a laptop with a skylake GPU, and hook up two external monitors to it
- Move the cursor from the built-in LCD to one of the external displays as quickly as you can
- You'll get a few pipe underruns, and eventually the entire system will just freeze.
After doing a lot of investigation and reading through the bspec, I found the existence of the SAGV, which is responsible for adjusting the system agent voltage and clock frequencies depending on how much power we need. According to the bspec:
"The display engine access to system memory is blocked during the
adjustment time. SAGV defaults to enabled. Software must use the GT-driver pcode mailbox to disable SAGV when the display engine is not able to tolerate the blocking time."
The rest of the bspec goes on to explain that software can simply leave the SAGV enabled, and disable it when we use interlaced pipes/have more then one pipe active.
Sure enough, with this patchset the system hangs resulting from pipe underruns on Skylake have completely vanished on my T460s. Additionally,
the bspec mentions turning off the SAGV with more then one pipe enabled
as a workaround for display underruns. While this patch doesn't entirely fix that, it looks like it does improve the situation a little bit so it's likely this is going to be required to make watermarks on Skylake fully functional.
Changes since v9:
- Only enable/disable sagv on Skylake
Changes since v8:
- Add intel_state->modeset guard to the conditional for skl_enable_sagv()
Changes since v7:
- Remove GEN9_SAGV_LOW_FREQ, replace with GEN9_SAGV_IS_ENABLED (that's all we use it for anyway)
- Use GEN9_SAGV_IS_ENABLED instead of 0x1 for clarification
- Fix a styling error that snuck past me
Changes since v6:
- Protect skl_enable_sagv() with intel_state->modeset conditional in intel_atomic_commit_tail()
Changes since v5:
- Don't use is_power_of_2. Makes things confusing
- Don't use the old state to figure out whether or not to enable/disable the sagv, use the new one
- Split the loop in skl_disable_sagv into it's own function
- Move skl_sagv_enable/disable() calls into intel_atomic_commit_tail()
Changes since v4:
- Use is_power_of_2 against active_crtcs to check whether we have > 1 pipe enabled
- Fix skl_sagv_get_hw_state(): (temp & 0x1) indicates disabled, 0x0 enabled
- Call skl_sagv_enable/disable() from pre/post-plane updates
Changes since v3:
- Use time_before() to compare timeout to jiffies
Changes since v2:
- Really apply minor style nitpicks to patch this time
Changes since v1:
- Added comments about this probably being one of the requirements to fixing Skylake's watermark issues
- Minor style nitpicks from Matt Roper
- Disable these functions on Broxton, since it doesn't have an SAGV
squash! drm/i915/skl: Add support for the SAGV, fix underrun hangs
squash! drm/i915/skl: Add support for the SAGV, fix underrun hangs
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 4 ++ drivers/gpu/drm/i915/intel_display.c | 12 ++++ drivers/gpu/drm/i915/intel_drv.h | 2 + drivers/gpu/drm/i915/intel_pm.c | 112 +++++++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -1944,6 +1944,8 @@ struct drm_i915_private {struct i915_suspend_saved_registers regfile;struct vlv_s0ix_state vlv_s0ix_state; +bool skl_sagv_enabled; +struct {/* * Raw watermark latency values:
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -7143,6 +7143,10 @@ enum {#define HSW_PCODE_DE_WRITE_FREQ_REQ 0x17#define DISPLAY_IPS_CONTROL 0x19#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A +#define GEN9_PCODE_SAGV_CONTROL 0x21 +#define GEN9_SAGV_DISABLE 0x0 +#define GEN9_SAGV_IS_DISABLED 0x1 +#define GEN9_SAGV_DYNAMIC_FREQ 0x3#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_display.c +12 -0
@@ -13769,6 +13769,14 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) intel_state->cdclk_pll_vco != dev_priv->cdclk_pll.vco)) dev_priv->display.modeset_commit_cdclk(state); +/* +* SKL workaround: bspec recommends we disable the SAGV when we +* have more then one pipe enabled +*/ +if (IS_SKYLAKE (dev_priv) && +hweight32 (intel_state->active_crtcs) >1 ) +skl_disable_sagv (dev_priv); +intel_modeset_verify_disabled (dev); }
@@ -13842,6 +13850,10 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)intel_modeset_verify_crtc (crtc, old_crtc_state, crtc->state); } +if (IS_SKYLAKE (dev_priv) && intel_state->modeset && +hweight32 (intel_state->active_crtcs) <=1 ) +skl_enable_sagv (dev_priv); +drm_atomic_helper_commit_hw_done (state);if (intel_state->modeset)
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -1698,6 +1698,8 @@ void ilk_wm_get_hw_state(struct drm_device *dev);void skl_wm_get_hw_state (struct drm_device *dev);void skl_ddb_get_hw_state (struct drm_i915_private *dev_priv,struct skl_ddb_allocation *ddb/* out */ ); +int skl_enable_sagv (struct drm_i915_private *dev_priv); +int skl_disable_sagv (struct drm_i915_private *dev_priv);uint32_t ilk_pipe_pixel_rate (const struct intel_crtc_state *pipe_config);bool ilk_disable_lp_wm (struct drm_device *dev);int sanitize_rc6_option (struct drm_i915_private *dev_priv,int enable_rc6);
drivers/gpu/drm/i915/intel_pm.c +112 -0
124 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 1/6 drm/i915/skl: Add support for the SAGV, fix underrun hangs
In reply to LyudeSince the watermark calculations for Skylake are still broken, we're apt to hitting underruns very easily under multi-monitor configurations. While it would be lovely if this was fixed, it's not. Another problem that's been coming from this however, is the mysterious issue of underruns causing full system hangs. An easy way to reproduce this with a skylake system:
- Get a laptop with a skylake GPU, and hook up two external monitors to it
- Move the cursor from the built-in LCD to one of the external displays as quickly as you can
- You'll get a few pipe underruns, and eventually the entire system will just freeze.
After doing a lot of investigation and reading through the bspec, I found the existence of the SAGV, which is responsible for adjusting the system agent voltage and clock frequencies depending on how much power we need. According to the bspec:
"The display engine access to system memory is blocked during the
adjustment time. SAGV defaults to enabled. Software must use the GT-driver pcode mailbox to disable SAGV when the display engine is not able to tolerate the blocking time."
The rest of the bspec goes on to explain that software can simply leave the SAGV enabled, and disable it when we use interlaced pipes/have more then one pipe active.
Sure enough, with this patchset the system hangs resulting from pipe underruns on Skylake have completely vanished on my T460s. Additionally,
the bspec mentions turning off the SAGV with more then one pipe enabled
as a workaround for display underruns. While this patch doesn't entirely fix that, it looks like it does improve the situation a little bit so it's likely this is going to be required to make watermarks on Skylake fully functional.
Changes since v9:
- Only enable/disable sagv on Skylake
Changes since v8:
- Add intel_state->modeset guard to the conditional for skl_enable_sagv()
Changes since v7:
- Remove GEN9_SAGV_LOW_FREQ, replace with GEN9_SAGV_IS_ENABLED (that's all we use it for anyway)
- Use GEN9_SAGV_IS_ENABLED instead of 0x1 for clarification
- Fix a styling error that snuck past me
Changes since v6:
- Protect skl_enable_sagv() with intel_state->modeset conditional in intel_atomic_commit_tail()
Changes since v5:
- Don't use is_power_of_2. Makes things confusing
- Don't use the old state to figure out whether or not to enable/disable the sagv, use the new one
- Split the loop in skl_disable_sagv into it's own function
- Move skl_sagv_enable/disable() calls into intel_atomic_commit_tail()
Changes since v4:
- Use is_power_of_2 against active_crtcs to check whether we have > 1 pipe enabled
- Fix skl_sagv_get_hw_state(): (temp & 0x1) indicates disabled, 0x0 enabled
- Call skl_sagv_enable/disable() from pre/post-plane updates
Changes since v3:
- Use time_before() to compare timeout to jiffies
Changes since v2:
- Really apply minor style nitpicks to patch this time
Changes since v1:
- Added comments about this probably being one of the requirements to fixing Skylake's watermark issues
- Minor style nitpicks from Matt Roper
- Disable these functions on Broxton, since it doesn't have an SAGV
squash! drm/i915/skl: Add support for the SAGV, fix underrun hangs
squash! drm/i915/skl: Add support for the SAGV, fix underrun hangs
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 4 ++ drivers/gpu/drm/i915/intel_display.c | 12 ++++ drivers/gpu/drm/i915/intel_drv.h | 2 + drivers/gpu/drm/i915/intel_pm.c | 112 +++++++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -1944,6 +1944,8 @@ struct drm_i915_private {struct i915_suspend_saved_registers regfile;struct vlv_s0ix_state vlv_s0ix_state; +bool skl_sagv_enabled; +struct {/* * Raw watermark latency values:
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -7143,6 +7143,10 @@ enum {#define HSW_PCODE_DE_WRITE_FREQ_REQ 0x17#define DISPLAY_IPS_CONTROL 0x19#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A +#define GEN9_PCODE_SAGV_CONTROL 0x21 +#define GEN9_SAGV_DISABLE 0x0 +#define GEN9_SAGV_IS_DISABLED 0x1 +#define GEN9_SAGV_DYNAMIC_FREQ 0x3#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_display.c +12 -0
@@ -13769,6 +13769,14 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) intel_state->cdclk_pll_vco != dev_priv->cdclk_pll.vco)) dev_priv->display.modeset_commit_cdclk(state); +/* +* SKL workaround: bspec recommends we disable the SAGV when we +* have more then one pipe enabled +*/ +if (IS_SKYLAKE (dev_priv) && +hweight32 (intel_state->active_crtcs) >1 ) +skl_disable_sagv (dev_priv); +intel_modeset_verify_disabled (dev); }
@@ -13842,6 +13850,10 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)intel_modeset_verify_crtc (crtc, old_crtc_state, crtc->state); } +if (IS_SKYLAKE (dev_priv) && intel_state->modeset && +hweight32 (intel_state->active_crtcs) <=1 ) +skl_enable_sagv (dev_priv); +drm_atomic_helper_commit_hw_done (state);if (intel_state->modeset)
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -1698,6 +1698,8 @@ void ilk_wm_get_hw_state(struct drm_device *dev);void skl_wm_get_hw_state (struct drm_device *dev);void skl_ddb_get_hw_state (struct drm_i915_private *dev_priv,struct skl_ddb_allocation *ddb/* out */ ); +int skl_enable_sagv (struct drm_i915_private *dev_priv); +int skl_disable_sagv (struct drm_i915_private *dev_priv);uint32_t ilk_pipe_pixel_rate (const struct intel_crtc_state *pipe_config);bool ilk_disable_lp_wm (struct drm_device *dev);int sanitize_rc6_option (struct drm_i915_private *dev_priv,int enable_rc6);
drivers/gpu/drm/i915/intel_pm.c +112 -0
124 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH REBASED v10 1/6] drm/i915/skl: Add support for the SAGV, fix underrun hangs
Op 10-08-16 om 16:27 schreef Lyude:
Quoted 171 lines
Since the watermark calculations for Skylake are still broken, we're apt to hitting underruns very easily under multi-monitor configurations. While it would be lovely if this was fixed, it's not. Another problem that's been coming from this however, is the mysterious issue of underruns causing full system hangs. An easy way to reproduce this with a skylake system:
- Get a laptop with a skylake GPU, and hook up two external monitors to it
- Move the cursor from the built-in LCD to one of the external displays as quickly as you can
- You'll get a few pipe underruns, and eventually the entire system will just freeze.After doing a lot of investigation and reading through the bspec, I found the existence of the SAGV, which is responsible for adjusting the system agent voltage and clock frequencies depending on how much power we need. According to the bspec:
"The display engine access to system memory is blocked during the
adjustment time. SAGV defaults to enabled. Software must use the GT-driver pcode mailbox to disable SAGV when the display engine is not able to tolerate the blocking time."The rest of the bspec goes on to explain that software can simply leave the SAGV enabled, and disable it when we use interlaced pipes/have more then one pipe active.
Sure enough, with this patchset the system hangs resulting from pipe underruns on Skylake have completely vanished on my T460s. Additionally,
the bspec mentions turning off the SAGV with more then one pipe enabled
as a workaround for display underruns. While this patch doesn't entirely fix that, it looks like it does improve the situation a little bit so it's likely this is going to be required to make watermarks on Skylake fully functional.Changes since v9:
- Only enable/disable sagv on Skylake
Changes since v8:
- Addintel_state->modesetguard to the conditional forskl_enable_sagv()
Changes since v7:
- RemoveGEN9_SAGV_LOW_FREQ, replace withGEN9_SAGV_IS_ENABLED(that's all we use it for anyway)
- UseGEN9_SAGV_IS_ENABLEDinstead of0x1for clarification
- Fix a styling error that snuck past me
Changes since v6:
- Protectskl_enable_sagv()withintel_state->modesetconditional inintel_atomic_commit_tail()
Changes since v5:
- Don't useis_power_of_2. Makes things confusing
- Don't use the old state to figure out whether or not to enable/disable the sagv, use the new one
- Split the loop inskl_disable_sagvinto it's own function
- Move skl_sagv_enable/disable() calls intointel_atomic_commit_tail()
Changes since v4:
- Useis_power_of_2againstactive_crtcsto check whether we have > 1 pipe enabled
- Fixskl_sagv_get_hw_state(): (temp &0x1) indicates disabled,0x0enabled
- Call skl_sagv_enable/disable() from pre/post-plane updates
Changes since v3:
- Usetime_before()to compare timeout to jiffies
Changes since v2:
- Really apply minor style nitpicks to patch this time
Changes since v1:
- Added comments about this probably being one of the requirements to fixing Skylake's watermark issues
- Minor style nitpicks from Matt Roper
- Disable these functions on Broxton, since it doesn't have an SAGVReviewed-by Matt Roper <[email protected]>Reviewed-by Maarten Lankhorst <[email protected]>Signed-off-by Lyude <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>squash! drm/i915/skl: Add support for the SAGV, fix underrun hangs
squash! drm/i915/skl: Add support for the SAGV, fix underrun hangs
Signed-off-by Lyude <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 4 ++ drivers/gpu/drm/i915/intel_display.c | 12 ++++ drivers/gpu/drm/i915/intel_drv.h | 2 + drivers/gpu/drm/i915/intel_pm.c | 112 +++++++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -1944,6 +1944,8 @@ struct drm_i915_private {struct i915_suspend_saved_registers regfile;struct vlv_s0ix_state vlv_s0ix_state; +bool skl_sagv_enabled; +struct {/* * Raw watermark latency values: drivers/gpu/drm/i915/i915_reg.h +4
-0@@ -7143,6 +7143,10 @@ enum {#define HSW_PCODE_DE_WRITE_FREQ_REQ 0x17#define DISPLAY_IPS_CONTROL 0x19#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A +#define GEN9_PCODE_SAGV_CONTROL 0x21 +#define GEN9_SAGV_DISABLE 0x0 +#define GEN9_SAGV_IS_DISABLED 0x1 +#define GEN9_SAGV_DYNAMIC_FREQ 0x3#define GEN6_PCODE_DATA _MMIO(0x138128)#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16drivers/gpu/drm/i915/intel_display.c +12
-0@@ -13769,6 +13769,14 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) intel_state->cdclk_pll_vco != dev_priv->cdclk_pll.vco)) dev_priv->display.modeset_commit_cdclk(state); +/* +* SKL workaround: bspec recommends we disable the SAGV when we +* have more then one pipe enabled +*/ +if (IS_SKYLAKE (dev_priv) && +hweight32 (intel_state->active_crtcs) >1 ) +skl_disable_sagv (dev_priv); +intel_modeset_verify_disabled (dev); }@@ -13842,6 +13850,10 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)intel_modeset_verify_crtc (crtc, old_crtc_state, crtc->state); } +if (IS_SKYLAKE (dev_priv) && intel_state->modeset && +hweight32 (intel_state->active_crtcs) <=1 ) +skl_enable_sagv (dev_priv); +drm_atomic_helper_commit_hw_done (state);if (intel_state->modeset)drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -1698,6 +1698,8 @@ void ilk_wm_get_hw_state(struct drm_device *dev);void skl_wm_get_hw_state (struct drm_device *dev);void skl_ddb_get_hw_state (struct drm_i915_private *dev_priv,struct skl_ddb_allocation *ddb/* out */ ); +int skl_enable_sagv (struct drm_i915_private *dev_priv); +int skl_disable_sagv (struct drm_i915_private *dev_priv);uint32_t ilk_pipe_pixel_rate (const struct intel_crtc_state *pipe_config);bool ilk_disable_lp_wm (struct drm_device *dev);int sanitize_rc6_option (struct drm_i915_private *dev_priv,int enable_rc6);drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -2884,6 +2884,116 @@ skl_wm_plane_id(const struct intel_plane *plane) }static void +skl_sagv_get_hw_state (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_pm.c skl_wm_plane_id(const struct intel_plane *plane) · line 2897
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +10
-0+{ +u32 temp; +int ret; + +if (IS_BROXTON (dev_priv)) +return ; + +mutex_lock (&dev_priv->rps.hw_lock); + ret =sandybridge_pcode_read (dev_priv,GEN9_PCODE_SAGV_CONTROL , &temp); +mutex_unlock (&dev_priv->rps.hw_lock);
You need to initialize temp before calling sandybridge_pcode_read, it's confusing but the function's really pcode_writeread.
It also means you probably can't read out SAGV without adjusting it's value. :(
Maybe set sagv initially based on how many crtc's are active after hw readout?
Quoted 57 lines
drivers/gpu/drm/i915/intel_pm.c +57
-0+if (!ret) { + dev_priv->skl_sagv_enabled = !(temp &GEN9_SAGV_IS_DISABLED ); + }else { +/* +* If for some reason we can't access the SAGV state, follow +* the bspec and assume it's enabled +*/ +DRM_ERROR ("Failed to get SAGV state, assuming enabled\n" ); + dev_priv->skl_sagv_enabled = true; + } +} + +/* +* SAGV dynamically adjusts the system agent voltage and clock frequencies +* depending on power and performance requirements. The display engine access +* to system memory is blocked during the adjustment time. Having this enabled +* in multi-pipe configurations can cause issues (such as underruns causing +* full system hangs), and the bspec also suggests that software disable it +* when more then one pipe is enabled. +*/ +int +skl_enable_sagv (struct drm_i915_private *dev_priv) +{ +int ret; + +if (IS_BROXTON (dev_priv)) +return 0 ; +if (dev_priv->skl_sagv_enabled) +return 0 ; + +mutex_lock (&dev_priv->rps.hw_lock); +DRM_DEBUG_KMS ("Enabling the SAGV\n" ); + + ret =sandybridge_pcode_write (dev_priv,GEN9_PCODE_SAGV_CONTROL , +GEN9_SAGV_DYNAMIC_FREQ ); +if (!ret) + dev_priv->skl_sagv_enabled = true; +else +DRM_ERROR ("Failed to enable the SAGV\n" ); + +/* We don't need to wait for SAGV when enabling */ +mutex_unlock (&dev_priv->rps.hw_lock); +return ret; +} + +static int +skl_do_sagv_disable (struct drm_i915_private *dev_priv) +{ +int ret; +uint32_t temp; + + ret =sandybridge_pcode_write (dev_priv,GEN9_PCODE_SAGV_CONTROL , +GEN9_SAGV_DISABLE ); +if (ret) { +DRM_ERROR ("Failed to disable the SAGV\n" ); +return ret; + }
drivers/gpu/drm/i915/intel_pm.c skl_wm_plane_id(const struct intel_plane *plane) · line 2965
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +10
-0+ + ret =sandybridge_pcode_read (dev_priv,GEN9_PCODE_SAGV_CONTROL , + &temp); +if (ret) { +DRM_ERROR ("Failed to check the status of the SAGV\n" ); +return ret; + } + +return temp &GEN9_SAGV_IS_DISABLED ; +}
This will work better if you remove the sandybridge_pcode_write, and initialise temp to GEN9_SAGV_DISABLE.
The read function first writes something, then records its response. Right now it's checking the response to garbage.
Can you verify that this works?
Quoted 15 lines
drivers/gpu/drm/i915/intel_pm.c +15
-0+int +skl_disable_sagv (struct drm_i915_private *dev_priv) +{ +int ret, result; + +if (IS_BROXTON (dev_priv)) +return 0 ; +if (!dev_priv->skl_sagv_enabled) +return 0 ; + +mutex_lock (&dev_priv->rps.hw_lock); +DRM_DEBUG_KMS ("Disabling the SAGV\n" ); + +/* bspec says to keep retrying for at least 1 ms */ + ret =wait_for (result =skl_do_sagv_disable (dev_priv),1 );
drivers/gpu/drm/i915/intel_pm.c skl_wm_plane_id(const struct intel_plane *plane) · line 2991
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +10
-0+mutex_unlock (&dev_priv->rps.hw_lock); + +if (ret == -ETIMEDOUT ) { +DRM_ERROR ("Request to disable SAGV timed out\n" ); + }else { +if (result ==GEN9_SAGV_IS_DISABLED ) + dev_priv->skl_sagv_enabled = false; + + ret = result; + }
I've found out why SAGV doesn't work. Looking at the doc for BSW after the busy bit is cleared the lower byte contains status. In my case the status is 01h ILLEGAL_CMD, so I'm guessing SAGV is not supported or forced disabled.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v10 2/6 drm/i915/gen9: Only copy WM results for changed pipes to skl_hw
In reply to LyudeFrom: Matt Roper <[email protected]>
When we write watermark values to the hardware, those values are stored in dev_priv->wm.skl_hw. However with recent watermark changes, the results structure we're copying from only contains valid watermark and DDB values for the pipes that are actually changing; the values for other pipes remain 0. Thus a blind copy of the entire skl_wm_values structure will clobber the values for unchanged pipes...we need to be more selective and only copy over the values for the changing pipes.
This mistake was hidden until recently due to another bug that caused us to erroneously re-calculate watermarks for all active pipes rather than changing pipes. Only when that bug was fixed was the impact of this bug discovered (e.g., modesets failing with "Requested display configuration exceeds system watermark limitations" messages and leaving watermarks non-functional, even ones initiated by intel_fbdev_restore_mode).
Changes since v1:
- Add a function for copying a pipe's wm values (skl_copy_wm_for_pipe()) so we can reuse this later
--- drivers/gpu/drm/i915/intel_pm.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +26 -2
@@ -4066,6 +4066,24 @@ skl_compute_ddb(struct drm_atomic_state *state)return 0 ; } +static void +skl_copy_wm_for_pipe (struct skl_wm_values *dst, +struct skl_wm_values *src, +enum pipe pipe) +{ + dst->wm_linetime[pipe] = src->wm_linetime[pipe]; +memcpy (dst->plane[pipe], src->plane[pipe], +sizeof (dst->plane[pipe])); +memcpy (dst->plane_trans[pipe], src->plane_trans[pipe], +sizeof (dst->plane_trans[pipe])); + + dst->ddb.pipe[pipe] = src->ddb.pipe[pipe]; +memcpy (dst->ddb.y_plane[pipe], src->ddb.y_plane[pipe], +sizeof (dst->ddb.y_plane[pipe])); +memcpy (dst->ddb.plane[pipe], src->ddb.plane[pipe], +sizeof (dst->ddb.plane[pipe])); +} +static int skl_compute_wm (struct drm_atomic_state *state) {
@@ -4138,8 +4156,10 @@ static void skl_update_wm(struct drm_crtc *crtc)struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct skl_wm_values *results = &dev_priv->wm.skl_results; +struct skl_wm_values *hw_vals = &dev_priv->wm.skl_hw;struct intel_crtc_state *cstate =to_intel_crtc_state (crtc->state);struct skl_pipe_wm *pipe_wm = &cstate->wm.skl.optimal; +int pipe;if ((results->dirty_pipes &drm_crtc_mask (crtc)) ==0 )return ;
@@ -4151,8 +4171,12 @@ static void skl_update_wm(struct drm_crtc *crtc)skl_write_wm_values (dev_priv, results);skl_flush_wm_values (dev_priv, results); -/* store the new configuration */ - dev_priv->wm.skl_hw = *results; +/* +* Store the new configuration (but only for the pipes that have +* changed; the other values weren't recomputed). +*/ +for_each_pipe_masked (dev_priv, pipe, results->dirty_pipes) +skl_copy_wm_for_pipe (hw_vals, results, pipe);mutex_unlock (&dev_priv->wm.wm_mutex); }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 2/6 drm/i915/gen9: Only copy WM results for changed pipes to skl_hw
In reply to LyudeFrom: Matt Roper <[email protected]>
When we write watermark values to the hardware, those values are stored in dev_priv->wm.skl_hw. However with recent watermark changes, the results structure we're copying from only contains valid watermark and DDB values for the pipes that are actually changing; the values for other pipes remain 0. Thus a blind copy of the entire skl_wm_values structure will clobber the values for unchanged pipes...we need to be more selective and only copy over the values for the changing pipes.
This mistake was hidden until recently due to another bug that caused us to erroneously re-calculate watermarks for all active pipes rather than changing pipes. Only when that bug was fixed was the impact of this bug discovered (e.g., modesets failing with "Requested display configuration exceeds system watermark limitations" messages and leaving watermarks non-functional, even ones initiated by intel_fbdev_restore_mode).
Changes since v1:
- Add a function for copying a pipe's wm values (skl_copy_wm_for_pipe()) so we can reuse this later
--- drivers/gpu/drm/i915/intel_pm.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +26 -2
@@ -4066,6 +4066,24 @@ skl_compute_ddb(struct drm_atomic_state *state)return 0 ; } +static void +skl_copy_wm_for_pipe (struct skl_wm_values *dst, +struct skl_wm_values *src, +enum pipe pipe) +{ + dst->wm_linetime[pipe] = src->wm_linetime[pipe]; +memcpy (dst->plane[pipe], src->plane[pipe], +sizeof (dst->plane[pipe])); +memcpy (dst->plane_trans[pipe], src->plane_trans[pipe], +sizeof (dst->plane_trans[pipe])); + + dst->ddb.pipe[pipe] = src->ddb.pipe[pipe]; +memcpy (dst->ddb.y_plane[pipe], src->ddb.y_plane[pipe], +sizeof (dst->ddb.y_plane[pipe])); +memcpy (dst->ddb.plane[pipe], src->ddb.plane[pipe], +sizeof (dst->ddb.plane[pipe])); +} +static int skl_compute_wm (struct drm_atomic_state *state) {
@@ -4138,8 +4156,10 @@ static void skl_update_wm(struct drm_crtc *crtc)struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct skl_wm_values *results = &dev_priv->wm.skl_results; +struct skl_wm_values *hw_vals = &dev_priv->wm.skl_hw;struct intel_crtc_state *cstate =to_intel_crtc_state (crtc->state);struct skl_pipe_wm *pipe_wm = &cstate->wm.skl.optimal; +int pipe;if ((results->dirty_pipes &drm_crtc_mask (crtc)) ==0 )return ;
@@ -4151,8 +4171,12 @@ static void skl_update_wm(struct drm_crtc *crtc)skl_write_wm_values (dev_priv, results);skl_flush_wm_values (dev_priv, results); -/* store the new configuration */ - dev_priv->wm.skl_hw = *results; +/* +* Store the new configuration (but only for the pipes that have +* changed; the other values weren't recomputed). +*/ +for_each_pipe_masked (dev_priv, pipe, results->dirty_pipes) +skl_copy_wm_for_pipe (hw_vals, results, pipe);mutex_unlock (&dev_priv->wm.wm_mutex); }
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v10 3/6 drm/i915/skl: Update plane watermarks atomically during plane updates
In reply to LyudeThanks to Ville for suggesting this as a potential solution to pipe underruns on Skylake.
On Skylake all of the registers for configuring planes, including the registers for configuring their watermarks, are double buffered. New values written to them won't take effect until said registers are "armed", which is done by writing to the PLANE_SURF (or in the case of cursor planes, the CURBASE register) register.
With this in mind, up until now we've been updating watermarks on skl like this:
non-modeset {
- calculate (during atomic check phase)
- finish_atomic_commit:
- intel_pre_plane_update:
- intel_update_watermarks()
- {vblank happens; new watermarks + old plane values => underrun }
- drm_atomic_helper_commit_planes_on_crtc:
- start vblank evasion
- write new plane registers
- end vblank evasion
}
or
modeset {
- calculate (during atomic check phase)
- finish_atomic_commit:
- crtc_enable:
- intel_update_watermarks()
- {vblank happens; new watermarks + old plane values => underrun }
- drm_atomic_helper_commit_planes_on_crtc:
- start vblank evasion
- write new plane registers
- end vblank evasion
}
Now we update watermarks atomically like this:
non-modeset {
- calculate (during atomic check phase)
- finish_atomic_commit:
- intel_pre_plane_update:
- intel_update_watermarks() (wm values aren't written yet)
- drm_atomic_helper_commit_planes_on_crtc:
- start vblank evasion
- write new plane registers
- write new wm values
- end vblank evasion
}
modeset {
- calculate (during atomic check phase)
- finish_atomic_commit:
- crtc_enable:
- intel_update_watermarks() (actual wm values aren't written yet)
- drm_atomic_helper_commit_planes_on_crtc:
- start vblank evasion
- write new plane registers
- write new wm values
- end vblank evasion
}
So this patch moves all of the watermark writes into the right place; inside of the vblank evasion where we update all of the registers for each plane. While this patch doesn't fix everything, it does allow us to update the watermark values in the way the hardware expects us to.
Changes since original patch series:
- Remove mutex_lock/mutex_unlock since they don't do anything and we're not touching global state
- Move skl_write_cursor_wm/skl_write_plane_wm functions into intel_pm.c, make externally visible
- Add skl_write_plane_wm calls to skl_update_plane
- Fix conditional for for loop in skl_write_plane_wm (level < max_level should be level <= max_level)
- Make diagram in commit more accurate to what's actually happening
- Add Fixes:
Changes since v1:
- Use IS_GEN9() instead of IS_SKYLAKE() since these fixes apply to more then just Skylake
- Update description to make it clear this patch doesn't fix everything
- Check if pipes were actually changed before writing watermarks
Changes since v2:
- Write PIPE_WM_LINETIME during vblank evasion
Changes since v3:
- Rebase against new SAGV patch changes
Changes since v4:
- Add a parameter to choose what skl_wm_values struct to use when writing new plane watermarks
Changes since v5:
- Remove cursor ddb entry write in skl_write_cursor_wm(), defer until patch 6
- Write WM_LINETIME in intel_begin_crtc_commit()
Changes since v6:
- Remove redundant dirty_pipes check in skl_write_plane_wm (we check this in all places where we call this function, and it was supposed to have been removed earlier anyway)
- In i9xx_update_cursor(), use dev_priv->info.gen >= 9 instead of IS_GEN9(dev_priv). We do this everywhere else and I'd imagine this needs to be done for gen10 as well
--- drivers/gpu/drm/i915/intel_display.c | 16 +++++++++++- drivers/gpu/drm/i915/intel_drv.h | 5 ++++ drivers/gpu/drm/i915/intel_pm.c | 50 ++++++++++++++++++++++++------------ drivers/gpu/drm/i915/intel_sprite.c | 6 +++++ 4 files changed, 60 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_display.c +15 -1
@@ -2980,6 +2980,7 @@ static void skylake_update_primary_plane(struct drm_plane *plane,struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_framebuffer *fb = plane_state->base.fb;struct drm_i915_gem_object *obj =intel_fb_obj (fb); +struct skl_wm_values *wm = &dev_priv->wm.skl_results;int pipe = intel_crtc->pipe;u32 plane_ctl, stride_div, stride;u32 tile_height, plane_offset, plane_size;
@@ -3031,6 +3032,9 @@ static void skylake_update_primary_plane(struct drm_plane *plane, intel_crtc->adjusted_x = x_offset; intel_crtc->adjusted_y = y_offset; +if (wm->dirty_pipes &drm_crtc_mask (&intel_crtc->base)) +skl_write_plane_wm (intel_crtc, wm,0 ); +I915_WRITE (PLANE_CTL (pipe,0 ), plane_ctl);I915_WRITE (PLANE_OFFSET (pipe,0 ), plane_offset);I915_WRITE (PLANE_SIZE (pipe,0 ), plane_size);
@@ -10310,9 +10314,13 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct skl_wm_values *wm = &dev_priv->wm.skl_results;int pipe = intel_crtc->pipe;uint32_t cntl =0 ; +if (dev_priv->info.gen >=9 && wm->dirty_pipes &drm_crtc_mask (crtc)) +skl_write_cursor_wm (intel_crtc, wm); +if (plane_state && plane_state->base.visible) { cntl =MCURSOR_GAMMA_ENABLE ;switch (plane_state->base.crtc_w) {
@@ -14222,10 +14230,12 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc, struct drm_crtc_state *old_crtc_state) {struct drm_device *dev = crtc->dev; +struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct intel_crtc_state *old_intel_state =to_intel_crtc_state (old_crtc_state);bool modeset =needs_modeset (crtc->state); +enum pipe pipe = intel_crtc->pipe;/* Perform vblank evasion around commit operation */ intel_pipe_update_start (intel_crtc);
@@ -14240,8 +14250,12 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,if (to_intel_crtc_state (crtc->state)->update_pipe)intel_update_pipe_config (intel_crtc, old_intel_state); -else if (INTEL_INFO (dev)->gen >=9 ) +else if (INTEL_INFO (dev)->gen >=9 ) {skl_detach_scalers (intel_crtc); + +I915_WRITE (PIPE_WM_LINETIME (pipe), + dev_priv->wm.skl_hw.wm_linetime[pipe]); + } } static void intel_finish_crtc_commit(struct drm_crtc *crtc,
drivers/gpu/drm/i915/intel_drv.h +5 -0
@@ -1700,6 +1700,11 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, struct skl_ddb_allocation *ddb /* out */);int skl_enable_sagv (struct drm_i915_private *dev_priv);int skl_disable_sagv (struct drm_i915_private *dev_priv); +void skl_write_cursor_wm (struct intel_crtc *intel_crtc, +const struct skl_wm_values *wm); +void skl_write_plane_wm (struct intel_crtc *intel_crtc, +const struct skl_wm_values *wm, +int plane);uint32_t ilk_pipe_pixel_rate (const struct intel_crtc_state *pipe_config);bool ilk_disable_lp_wm (struct drm_device *dev);int sanitize_rc6_option (struct drm_i915_private *dev_priv,int enable_rc6);
drivers/gpu/drm/i915/intel_pm.c +34 -16
68 lines not on this page · raw message
drivers/gpu/drm/i915/intel_sprite.c +6 -0
@@ -204,6 +204,9 @@ skl_update_plane(struct drm_plane *drm_plane,struct intel_plane *intel_plane =to_intel_plane (drm_plane);struct drm_framebuffer *fb = plane_state->base.fb;struct drm_i915_gem_object *obj =intel_fb_obj (fb); +struct skl_wm_values *wm = &dev_priv->wm.skl_results; +struct drm_crtc *crtc = crtc_state->base.crtc; +struct intel_crtc *intel_crtc =to_intel_crtc (crtc);const int pipe = intel_plane->pipe;const int plane = intel_plane->plane +1 ;u32 plane_ctl, stride_div, stride;
@@ -239,6 +242,9 @@ skl_update_plane(struct drm_plane *drm_plane, crtc_w--; crtc_h--; +if (wm->dirty_pipes &drm_crtc_mask (crtc)) +skl_write_plane_wm (intel_crtc, wm, plane); +if (key->flags) {I915_WRITE (PLANE_KEYVAL (pipe, plane), key->min_value);I915_WRITE (PLANE_KEYMAX (pipe, plane), key->max_value);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 3/6 drm/i915/skl: Update plane watermarks atomically during plane updates
In reply to LyudeThanks to Ville for suggesting this as a potential solution to pipe underruns on Skylake.
On Skylake all of the registers for configuring planes, including the registers for configuring their watermarks, are double buffered. New values written to them won't take effect until said registers are "armed", which is done by writing to the PLANE_SURF (or in the case of cursor planes, the CURBASE register) register.
With this in mind, up until now we've been updating watermarks on skl like this:
non-modeset {
- calculate (during atomic check phase)
- finish_atomic_commit:
- intel_pre_plane_update:
- intel_update_watermarks()
- {vblank happens; new watermarks + old plane values => underrun }
- drm_atomic_helper_commit_planes_on_crtc:
- start vblank evasion
- write new plane registers
- end vblank evasion
}
or
modeset {
- calculate (during atomic check phase)
- finish_atomic_commit:
- crtc_enable:
- intel_update_watermarks()
- {vblank happens; new watermarks + old plane values => underrun }
- drm_atomic_helper_commit_planes_on_crtc:
- start vblank evasion
- write new plane registers
- end vblank evasion
}
Now we update watermarks atomically like this:
non-modeset {
- calculate (during atomic check phase)
- finish_atomic_commit:
- intel_pre_plane_update:
- intel_update_watermarks() (wm values aren't written yet)
- drm_atomic_helper_commit_planes_on_crtc:
- start vblank evasion
- write new plane registers
- write new wm values
- end vblank evasion
}
modeset {
- calculate (during atomic check phase)
- finish_atomic_commit:
- crtc_enable:
- intel_update_watermarks() (actual wm values aren't written yet)
- drm_atomic_helper_commit_planes_on_crtc:
- start vblank evasion
- write new plane registers
- write new wm values
- end vblank evasion
}
So this patch moves all of the watermark writes into the right place; inside of the vblank evasion where we update all of the registers for each plane. While this patch doesn't fix everything, it does allow us to update the watermark values in the way the hardware expects us to.
Changes since original patch series:
- Remove mutex_lock/mutex_unlock since they don't do anything and we're not touching global state
- Move skl_write_cursor_wm/skl_write_plane_wm functions into intel_pm.c, make externally visible
- Add skl_write_plane_wm calls to skl_update_plane
- Fix conditional for for loop in skl_write_plane_wm (level < max_level should be level <= max_level)
- Make diagram in commit more accurate to what's actually happening
- Add Fixes:
Changes since v1:
- Use IS_GEN9() instead of IS_SKYLAKE() since these fixes apply to more then just Skylake
- Update description to make it clear this patch doesn't fix everything
- Check if pipes were actually changed before writing watermarks
Changes since v2:
- Write PIPE_WM_LINETIME during vblank evasion
Changes since v3:
- Rebase against new SAGV patch changes
Changes since v4:
- Add a parameter to choose what skl_wm_values struct to use when writing new plane watermarks
Changes since v5:
- Remove cursor ddb entry write in skl_write_cursor_wm(), defer until patch 6
- Write WM_LINETIME in intel_begin_crtc_commit()
Changes since v6:
- Remove redundant dirty_pipes check in skl_write_plane_wm (we check this in all places where we call this function, and it was supposed to have been removed earlier anyway)
- In i9xx_update_cursor(), use dev_priv->info.gen >= 9 instead of IS_GEN9(dev_priv). We do this everywhere else and I'd imagine this needs to be done for gen10 as well
--- drivers/gpu/drm/i915/intel_display.c | 16 +++++++++++- drivers/gpu/drm/i915/intel_drv.h | 5 ++++ drivers/gpu/drm/i915/intel_pm.c | 50 ++++++++++++++++++++++++------------ drivers/gpu/drm/i915/intel_sprite.c | 6 +++++ 4 files changed, 60 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_display.c +15 -1
@@ -2980,6 +2980,7 @@ static void skylake_update_primary_plane(struct drm_plane *plane,struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_framebuffer *fb = plane_state->base.fb;struct drm_i915_gem_object *obj =intel_fb_obj (fb); +struct skl_wm_values *wm = &dev_priv->wm.skl_results;int pipe = intel_crtc->pipe;u32 plane_ctl, stride_div, stride;u32 tile_height, plane_offset, plane_size;
@@ -3031,6 +3032,9 @@ static void skylake_update_primary_plane(struct drm_plane *plane, intel_crtc->adjusted_x = x_offset; intel_crtc->adjusted_y = y_offset; +if (wm->dirty_pipes &drm_crtc_mask (&intel_crtc->base)) +skl_write_plane_wm (intel_crtc, wm,0 ); +I915_WRITE (PLANE_CTL (pipe,0 ), plane_ctl);I915_WRITE (PLANE_OFFSET (pipe,0 ), plane_offset);I915_WRITE (PLANE_SIZE (pipe,0 ), plane_size);
@@ -10310,9 +10314,13 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct skl_wm_values *wm = &dev_priv->wm.skl_results;int pipe = intel_crtc->pipe;uint32_t cntl =0 ; +if (dev_priv->info.gen >=9 && wm->dirty_pipes &drm_crtc_mask (crtc)) +skl_write_cursor_wm (intel_crtc, wm); +if (plane_state && plane_state->base.visible) { cntl =MCURSOR_GAMMA_ENABLE ;switch (plane_state->base.crtc_w) {
@@ -14222,10 +14230,12 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc, struct drm_crtc_state *old_crtc_state) {struct drm_device *dev = crtc->dev; +struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct intel_crtc_state *old_intel_state =to_intel_crtc_state (old_crtc_state);bool modeset =needs_modeset (crtc->state); +enum pipe pipe = intel_crtc->pipe;/* Perform vblank evasion around commit operation */ intel_pipe_update_start (intel_crtc);
@@ -14240,8 +14250,12 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,if (to_intel_crtc_state (crtc->state)->update_pipe)intel_update_pipe_config (intel_crtc, old_intel_state); -else if (INTEL_INFO (dev)->gen >=9 ) +else if (INTEL_INFO (dev)->gen >=9 ) {skl_detach_scalers (intel_crtc); + +I915_WRITE (PIPE_WM_LINETIME (pipe), + dev_priv->wm.skl_hw.wm_linetime[pipe]); + } } static void intel_finish_crtc_commit(struct drm_crtc *crtc,
drivers/gpu/drm/i915/intel_drv.h +5 -0
@@ -1700,6 +1700,11 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, struct skl_ddb_allocation *ddb /* out */);int skl_enable_sagv (struct drm_i915_private *dev_priv);int skl_disable_sagv (struct drm_i915_private *dev_priv); +void skl_write_cursor_wm (struct intel_crtc *intel_crtc, +const struct skl_wm_values *wm); +void skl_write_plane_wm (struct intel_crtc *intel_crtc, +const struct skl_wm_values *wm, +int plane);uint32_t ilk_pipe_pixel_rate (const struct intel_crtc_state *pipe_config);bool ilk_disable_lp_wm (struct drm_device *dev);int sanitize_rc6_option (struct drm_i915_private *dev_priv,int enable_rc6);
drivers/gpu/drm/i915/intel_pm.c +34 -16
68 lines not on this page · raw message
drivers/gpu/drm/i915/intel_sprite.c +6 -0
@@ -204,6 +204,9 @@ skl_update_plane(struct drm_plane *drm_plane,struct intel_plane *intel_plane =to_intel_plane (drm_plane);struct drm_framebuffer *fb = plane_state->base.fb;struct drm_i915_gem_object *obj =intel_fb_obj (fb); +struct skl_wm_values *wm = &dev_priv->wm.skl_results; +struct drm_crtc *crtc = crtc_state->base.crtc; +struct intel_crtc *intel_crtc =to_intel_crtc (crtc);const int pipe = intel_plane->pipe;const int plane = intel_plane->plane +1 ;u32 plane_ctl, stride_div, stride;
@@ -239,6 +242,9 @@ skl_update_plane(struct drm_plane *drm_plane, crtc_w--; crtc_h--; +if (wm->dirty_pipes &drm_crtc_mask (crtc)) +skl_write_plane_wm (intel_crtc, wm, plane); +if (key->flags) {I915_WRITE (PLANE_KEYVAL (pipe, plane), key->min_value);I915_WRITE (PLANE_KEYMAX (pipe, plane), key->max_value);
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
v10 cover Finally fix watermarks
In reply to LyudeRebased version of https://patchwork.freedesktop.org/series/10276/ . No changes
Lyude (5):
drm/i915/skl: Add support for the SAGV, fix underrun hangs drm/i915/skl: Update plane watermarks atomically during plane updates drm/i915/skl: Ensure pipes with changed wms get added to the state drm/i915: Move CRTC updating in atomic_commit into it's own hook drm/i915/skl: Update DDB values atomically with wms/plane attrs
Matt Roper (1):
drm/i915/gen9: Only copy WM results for changed pipes to skl_hw
drivers/gpu/drm/i915/i915_drv.h | 4 + drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_display.c | 198 +++++++++++++++---- drivers/gpu/drm/i915/intel_drv.h | 14 ++ drivers/gpu/drm/i915/intel_pm.c | 369 ++++++++++++++++++++--------------- drivers/gpu/drm/i915/intel_sprite.c | 6 + 6 files changed, 402 insertions(+), 193 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 4/6 drm/i915/skl: Ensure pipes with changed wms get added to the state
In reply to LyudeIf we're enabling a pipe, we'll need to modify the watermarks on all active planes. Since those planes won't be added to the state on their own, we need to add them ourselves.
--- drivers/gpu/drm/i915/intel_pm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +4 -0
@@ -4079,6 +4079,10 @@ skl_compute_ddb(struct drm_atomic_state *state) ret =skl_allocate_pipe_ddb (cstate, ddb);if (ret)return ret; + + ret =drm_atomic_add_affected_planes (state, &intel_crtc->base); +if (ret) +return ret; }return 0 ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 4/6 drm/i915/skl: Ensure pipes with changed wms get added to the state
In reply to LyudeIf we're enabling a pipe, we'll need to modify the watermarks on all active planes. Since those planes won't be added to the state on their own, we need to add them ourselves.
--- drivers/gpu/drm/i915/intel_pm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +4 -0
@@ -4079,6 +4079,10 @@ skl_compute_ddb(struct drm_atomic_state *state) ret =skl_allocate_pipe_ddb (cstate, ddb);if (ret)return ret; + + ret =drm_atomic_add_affected_planes (state, &intel_crtc->base); +if (ret) +return ret; }return 0 ;
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v10 5/6 drm/i915: Move CRTC updating in atomic_commit into it's own hook
In reply to LyudeSince we have to write ddb allocations at the same time as we do other plane updates, we're going to need to be able to control the order in which we execute modesets on each pipe. The easiest way to do this is to just factor this section of intel_atomic_commit_tail() (intel_atomic_commit() for stable branches) into it's own function, and add an appropriate display function hook for it.
Based off of Matt Rope's suggestions
Changes since v1:
- Drop pipe_config->base.active check in intel_update_crtcs() since we check that before calling the function
[omitting CC for stable, since this patch will need to be changed for such backports first]
Cc: Ville Syrjälä <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Radhakrishna Sripada <[email protected]>
Cc: Hans de Goede <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/intel_display.c | 74 +++++++++++++++++++++++++----------- 2 files changed, 54 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -630,6 +630,8 @@ struct drm_i915_display_funcs { struct intel_crtc_state *crtc_state);void (*crtc_enable)(struct drm_crtc *crtc);void (*crtc_disable)(struct drm_crtc *crtc); +void (*update_crtcs)(struct drm_atomic_state *state, +unsigned int *crtc_vblank_mask);void (*audio_codec_enable)(struct drm_connector *connector,struct intel_encoder *encoder,const struct drm_display_mode *adjusted_mode);
drivers/gpu/drm/i915/intel_display.c +52 -22
102 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 5/6 drm/i915: Move CRTC updating in atomic_commit into it's own hook
In reply to LyudeSince we have to write ddb allocations at the same time as we do other plane updates, we're going to need to be able to control the order in which we execute modesets on each pipe. The easiest way to do this is to just factor this section of intel_atomic_commit_tail() (intel_atomic_commit() for stable branches) into it's own function, and add an appropriate display function hook for it.
Based off of Matt Rope's suggestions
Changes since v1:
- Drop pipe_config->base.active check in intel_update_crtcs() since we check that before calling the function
[omitting CC for stable, since this patch will need to be changed for such backports first]
Cc: Ville Syrjälä <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Radhakrishna Sripada <[email protected]>
Cc: Hans de Goede <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/intel_display.c | 74 +++++++++++++++++++++++++----------- 2 files changed, 54 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -630,6 +630,8 @@ struct drm_i915_display_funcs { struct intel_crtc_state *crtc_state);void (*crtc_enable)(struct drm_crtc *crtc);void (*crtc_disable)(struct drm_crtc *crtc); +void (*update_crtcs)(struct drm_atomic_state *state, +unsigned int *crtc_vblank_mask);void (*audio_codec_enable)(struct drm_connector *connector,struct intel_encoder *encoder,const struct drm_display_mode *adjusted_mode);
drivers/gpu/drm/i915/intel_display.c +52 -22
102 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v10 6/6 drm/i915/skl: Update DDB values atomically with wms/plane attrs
In reply to LyudeNow that we can hook into update_crtcs and control the order in which we update CRTCs at each modeset, we can finish the final step of fixing Skylake's watermark handling by performing DDB updates at the same time as plane updates and watermark updates.
The first major change in this patch is skl_update_crtcs(), which handles ensuring that we order each CRTC update in our atomic commits properly so that they honor the DDB flush order.
The second major change in this patch is the order in which we flush the pipes. While the previous order may have worked, it can't be used in this approach since it no longer will do the right thing. For example, using the old ddb flush order:
We have pipes A, B, and C enabled, and we're disabling C. Initial ddb allocation looks like this:
| A | B |xxxxxxx|
Since we're performing the ddb updates after performing any CRTC disablements in intel_atomic_commit_tail(), the space to the right of pipe B is unallocated.
1. Flush pipes with new allocation contained into old space. None apply, so we skip this
2. Flush pipes having their allocation reduced, but overlapping with a previous allocation. None apply, so we also skip this
3. Flush pipes that got more space allocated. This applies to A and B, giving us the following update order: A, B
This is wrong, since updating pipe A first will cause it to overlap with B and potentially burst into flames. Our new order (see the code comments for details) would update the pipes in the proper order: B, A.
As well, we calculate the order for each DDB update during the check phase, and reference it later in the commit phase when we hit skl_update_crtcs().
This long overdue patch fixes the rest of the underruns on Skylake.
Changes since v1:
- Add skl_ddb_entry_write() for cursor into skl_write_cursor_wm()
Changes since v2:
- Use the method for updating CRTCs that Ville suggested
- In skl_update_wm(), only copy the watermarks for the crtc that was passed to us
Changes since v3:
- Small comment fix in skl_ddb_allocation_overlaps()
[omitting CC for stable, since this patch will need to be changed for such backports first]
Testcase: kms_cursor_legacy
--- drivers/gpu/drm/i915/intel_display.c | 100 +++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 7 ++ drivers/gpu/drm/i915/intel_pm.c | 207 +++++++++-------------------------- 3 files changed, 144 insertions(+), 170 deletions(-)
drivers/gpu/drm/i915/intel_display.c +88 -12
@@ -12974,16 +12974,23 @@ static void verify_wm_state(struct drm_crtc *crtc, hw_entry->start, hw_entry->end); } -/* cursor */ - hw_entry = &hw_ddb.plane[pipe][PLANE_CURSOR ]; - sw_entry = &sw_ddb->plane[pipe][PLANE_CURSOR ]; - -if (!skl_ddb_entry_equal (hw_entry, sw_entry)) { -DRM_ERROR ("mismatch in DDB state pipe %c cursor " -"(expected (%u,%u), found (%u,%u))\n" , -pipe_name (pipe), - sw_entry->start, sw_entry->end, - hw_entry->start, hw_entry->end); +/* +* cursor +* If the cursor plane isn't active, we may not have updated it's ddb +* allocation. In that case since the ddb allocation will be updated +* once the plane becomes visible, we can skip this check +*/ +if (intel_crtc->cursor_addr) { + hw_entry = &hw_ddb.plane[pipe][PLANE_CURSOR ]; + sw_entry = &sw_ddb->plane[pipe][PLANE_CURSOR ]; + +if (!skl_ddb_entry_equal (hw_entry, sw_entry)) { +DRM_ERROR ("mismatch in DDB state pipe %c cursor " +"(expected (%u,%u), found (%u,%u))\n" , +pipe_name (pipe), + sw_entry->start, sw_entry->end, + hw_entry->start, hw_entry->end); + } } }
@@ -13735,6 +13742,72 @@ static void intel_update_crtcs(struct drm_atomic_state *state, } } +static void skl_update_crtcs (struct drm_atomic_state *state, +unsigned int *crtc_vblank_mask) +{ +struct drm_device *dev = state->dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_atomic_state *intel_state =to_intel_atomic_state (state); +struct drm_crtc *crtc; +struct drm_crtc_state *old_crtc_state; +struct skl_ddb_allocation *new_ddb = &intel_state->wm_results.ddb; +struct skl_ddb_allocation cur_ddb; +bool progress; +bool reallocated[I915_MAX_PIPES ] = {}; +enum pipe pipe; +int wait_vbl_pipes, i; + +/* +* Whenever the number of active pipes change, so does the DDB +* allocation. DDB allocations on pipes cannot ever overlap with +* eachother at any point in time, so we need to change the order we +* update the pipes so that we ensure they never overlap inbetween DDB +* updates. +*/ +do { + progress = false; + wait_vbl_pipes =0 ; + cur_ddb = dev_priv->wm.skl_hw.ddb; + +for_each_crtc_in_state (state, crtc, old_crtc_state, i) { +struct intel_crtc *intel_crtc =to_intel_crtc (crtc); + pipe = intel_crtc->pipe; + +if (!intel_crtc->active ||needs_modeset (crtc->state)) +continue ; +if (skl_ddb_allocation_equals (&cur_ddb, new_ddb, pipe)) +continue ; +if (skl_ddb_allocation_overlaps (state, &cur_ddb, + new_ddb, pipe)) +continue ; + +intel_update_crtc (crtc, state, old_crtc_state, + crtc_vblank_mask); + + wait_vbl_pipes |=drm_crtc_mask (crtc); + reallocated[pipe] = true; + progress = true; + } + +/* Wait for each pipe's new allocation to take effect */ +intel_atomic_wait_for_vblanks (dev, dev_priv, wait_vbl_pipes); + }while (progress); + +/* +* Now that we've handled any ddb reallocations, we can go ahead and +* enable any new pipes. +*/ +for_each_crtc_in_state (state, crtc, old_crtc_state, i) { + pipe =to_intel_crtc (crtc)->pipe; + +if (reallocated[pipe] || !crtc->state->active) +continue ; + +intel_update_crtc (crtc, state, old_crtc_state, + crtc_vblank_mask); + } +} +static void intel_atomic_commit_tail (struct drm_atomic_state *state) {struct drm_device *dev = state->dev;
@@ -15338,8 +15411,6 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.crtc_disable = i9xx_crtc_disable; } - dev_priv->display.update_crtcs = intel_update_crtcs; -/* Returns the core display clock speed */ if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) dev_priv->display.get_display_clock_speed =
@@ -15429,6 +15500,11 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) skl_modeset_calc_cdclk; } +if (dev_priv->info.gen >=9 ) + dev_priv->display.update_crtcs = skl_update_crtcs; +else + dev_priv->display.update_crtcs = intel_update_crtcs; +switch (INTEL_INFO (dev_priv)->gen) {case 2 : dev_priv->display.queue_flip = intel_gen2_queue_flip;
drivers/gpu/drm/i915/intel_drv.h +7 -0
@@ -1700,6 +1700,13 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, struct skl_ddb_allocation *ddb /* out */);int skl_enable_sagv (struct drm_i915_private *dev_priv);int skl_disable_sagv (struct drm_i915_private *dev_priv); +bool skl_ddb_allocation_equals (const struct skl_ddb_allocation *old, +const struct skl_ddb_allocation *new, +enum pipe pipe); +bool skl_ddb_allocation_overlaps (struct drm_atomic_state *state, +const struct skl_ddb_allocation *old, +const struct skl_ddb_allocation *new, +enum pipe pipe);void skl_write_cursor_wm (struct intel_crtc *intel_crtc,const struct skl_wm_values *wm); void skl_write_plane_wm(struct intel_crtc *intel_crtc,
drivers/gpu/drm/i915/intel_pm.c +49 -158
247 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v10 6/6 drm/i915/skl: Update DDB values atomically with wms/plane attrs
In reply to LyudeNow that we can hook into update_crtcs and control the order in which we update CRTCs at each modeset, we can finish the final step of fixing Skylake's watermark handling by performing DDB updates at the same time as plane updates and watermark updates.
The first major change in this patch is skl_update_crtcs(), which handles ensuring that we order each CRTC update in our atomic commits properly so that they honor the DDB flush order.
The second major change in this patch is the order in which we flush the pipes. While the previous order may have worked, it can't be used in this approach since it no longer will do the right thing. For example, using the old ddb flush order:
We have pipes A, B, and C enabled, and we're disabling C. Initial ddb allocation looks like this:
| A | B |xxxxxxx|
Since we're performing the ddb updates after performing any CRTC disablements in intel_atomic_commit_tail(), the space to the right of pipe B is unallocated.
1. Flush pipes with new allocation contained into old space. None apply, so we skip this
2. Flush pipes having their allocation reduced, but overlapping with a previous allocation. None apply, so we also skip this
3. Flush pipes that got more space allocated. This applies to A and B, giving us the following update order: A, B
This is wrong, since updating pipe A first will cause it to overlap with B and potentially burst into flames. Our new order (see the code comments for details) would update the pipes in the proper order: B, A.
As well, we calculate the order for each DDB update during the check phase, and reference it later in the commit phase when we hit skl_update_crtcs().
This long overdue patch fixes the rest of the underruns on Skylake.
Changes since v1:
- Add skl_ddb_entry_write() for cursor into skl_write_cursor_wm()
Changes since v2:
- Use the method for updating CRTCs that Ville suggested
- In skl_update_wm(), only copy the watermarks for the crtc that was passed to us
Changes since v3:
- Small comment fix in skl_ddb_allocation_overlaps()
[omitting CC for stable, since this patch will need to be changed for such backports first]
Testcase: kms_cursor_legacy
--- drivers/gpu/drm/i915/intel_display.c | 100 +++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 7 ++ drivers/gpu/drm/i915/intel_pm.c | 207 +++++++++-------------------------- 3 files changed, 144 insertions(+), 170 deletions(-)
drivers/gpu/drm/i915/intel_display.c +88 -12
@@ -12974,16 +12974,23 @@ static void verify_wm_state(struct drm_crtc *crtc, hw_entry->start, hw_entry->end); } -/* cursor */ - hw_entry = &hw_ddb.plane[pipe][PLANE_CURSOR ]; - sw_entry = &sw_ddb->plane[pipe][PLANE_CURSOR ]; - -if (!skl_ddb_entry_equal (hw_entry, sw_entry)) { -DRM_ERROR ("mismatch in DDB state pipe %c cursor " -"(expected (%u,%u), found (%u,%u))\n" , -pipe_name (pipe), - sw_entry->start, sw_entry->end, - hw_entry->start, hw_entry->end); +/* +* cursor +* If the cursor plane isn't active, we may not have updated it's ddb +* allocation. In that case since the ddb allocation will be updated +* once the plane becomes visible, we can skip this check +*/ +if (intel_crtc->cursor_addr) { + hw_entry = &hw_ddb.plane[pipe][PLANE_CURSOR ]; + sw_entry = &sw_ddb->plane[pipe][PLANE_CURSOR ]; + +if (!skl_ddb_entry_equal (hw_entry, sw_entry)) { +DRM_ERROR ("mismatch in DDB state pipe %c cursor " +"(expected (%u,%u), found (%u,%u))\n" , +pipe_name (pipe), + sw_entry->start, sw_entry->end, + hw_entry->start, hw_entry->end); + } } }
@@ -13735,6 +13742,72 @@ static void intel_update_crtcs(struct drm_atomic_state *state, } } +static void skl_update_crtcs (struct drm_atomic_state *state, +unsigned int *crtc_vblank_mask) +{ +struct drm_device *dev = state->dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_atomic_state *intel_state =to_intel_atomic_state (state); +struct drm_crtc *crtc; +struct drm_crtc_state *old_crtc_state; +struct skl_ddb_allocation *new_ddb = &intel_state->wm_results.ddb; +struct skl_ddb_allocation cur_ddb; +bool progress; +bool reallocated[I915_MAX_PIPES ] = {}; +enum pipe pipe; +int wait_vbl_pipes, i; + +/* +* Whenever the number of active pipes change, so does the DDB +* allocation. DDB allocations on pipes cannot ever overlap with +* eachother at any point in time, so we need to change the order we +* update the pipes so that we ensure they never overlap inbetween DDB +* updates. +*/ +do { + progress = false; + wait_vbl_pipes =0 ; + cur_ddb = dev_priv->wm.skl_hw.ddb; + +for_each_crtc_in_state (state, crtc, old_crtc_state, i) { +struct intel_crtc *intel_crtc =to_intel_crtc (crtc); + pipe = intel_crtc->pipe; + +if (!intel_crtc->active ||needs_modeset (crtc->state)) +continue ; +if (skl_ddb_allocation_equals (&cur_ddb, new_ddb, pipe)) +continue ; +if (skl_ddb_allocation_overlaps (state, &cur_ddb, + new_ddb, pipe)) +continue ; + +intel_update_crtc (crtc, state, old_crtc_state, + crtc_vblank_mask); + + wait_vbl_pipes |=drm_crtc_mask (crtc); + reallocated[pipe] = true; + progress = true; + } + +/* Wait for each pipe's new allocation to take effect */ +intel_atomic_wait_for_vblanks (dev, dev_priv, wait_vbl_pipes); + }while (progress); + +/* +* Now that we've handled any ddb reallocations, we can go ahead and +* enable any new pipes. +*/ +for_each_crtc_in_state (state, crtc, old_crtc_state, i) { + pipe =to_intel_crtc (crtc)->pipe; + +if (reallocated[pipe] || !crtc->state->active) +continue ; + +intel_update_crtc (crtc, state, old_crtc_state, + crtc_vblank_mask); + } +} +static void intel_atomic_commit_tail (struct drm_atomic_state *state) {struct drm_device *dev = state->dev;
@@ -15338,8 +15411,6 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.crtc_disable = i9xx_crtc_disable; } - dev_priv->display.update_crtcs = intel_update_crtcs; -/* Returns the core display clock speed */ if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) dev_priv->display.get_display_clock_speed =
@@ -15429,6 +15500,11 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) skl_modeset_calc_cdclk; } +if (dev_priv->info.gen >=9 ) + dev_priv->display.update_crtcs = skl_update_crtcs; +else + dev_priv->display.update_crtcs = intel_update_crtcs; +switch (INTEL_INFO (dev_priv)->gen) {case 2 : dev_priv->display.queue_flip = intel_gen2_queue_flip;
drivers/gpu/drm/i915/intel_drv.h +7 -0
@@ -1700,6 +1700,13 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, struct skl_ddb_allocation *ddb /* out */);int skl_enable_sagv (struct drm_i915_private *dev_priv);int skl_disable_sagv (struct drm_i915_private *dev_priv); +bool skl_ddb_allocation_equals (const struct skl_ddb_allocation *old, +const struct skl_ddb_allocation *new, +enum pipe pipe); +bool skl_ddb_allocation_overlaps (struct drm_atomic_state *state, +const struct skl_ddb_allocation *old, +const struct skl_ddb_allocation *new, +enum pipe pipe);void skl_write_cursor_wm (struct intel_crtc *intel_crtc,const struct skl_wm_values *wm); void skl_write_plane_wm(struct intel_crtc *intel_crtc,
drivers/gpu/drm/i915/intel_pm.c +49 -158
247 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH REBASED v10 6/6] drm/i915/skl: Update DDB values atomically with wms/plane attrs
Hey,
Op 10-08-16 om 16:28 schreef Lyude:
Quoted 49 lines
Now that we can hook into
update_crtcsand control the order in which we update CRTCs at each modeset, we can finish the final step of fixing Skylake's watermark handling by performing DDB updates at the same time as plane updates and watermark updates.The first major change in this patch is
skl_update_crtcs(), which handles ensuring that we order each CRTC update in our atomic commits properly so that they honor the DDB flush order.The second major change in this patch is the order in which we flush the pipes. While the previous order may have worked, it can't be used in this approach since it no longer will do the right thing. For example, using the old ddb flush order:
We have pipes A, B, and C enabled, and we're disabling C. Initial ddb allocation looks like this:
| A | B |xxxxxxx|
Since we're performing the ddb updates after performing any CRTC disablements in
intel_atomic_commit_tail(), the space to the right of pipe B is unallocated.1. Flush pipes with new allocation contained into old space. None apply, so we skip this
2. Flush pipes having their allocation reduced, but overlapping with a previous allocation. None apply, so we also skip this
3. Flush pipes that got more space allocated. This applies to A and B, giving us the following update order: A, BThis is wrong, since updating pipe A first will cause it to overlap with B and potentially burst into flames. Our new order (see the code comments for details) would update the pipes in the proper order: B, A.
As well, we calculate the order for each DDB update during the check phase, and reference it later in the commit phase when we hit
skl_update_crtcs().This long overdue patch fixes the rest of the underruns on Skylake.
Changes since v1:
- Addskl_ddb_entry_write()for cursor intoskl_write_cursor_wm()
Changes since v2:
- Use the method for updating CRTCs that Ville suggested
- Inskl_update_wm(), only copy the watermarks for the crtc that was passed to us
Changes since v3:
- Small comment fix inskl_ddb_allocation_overlaps()
Quoted 4 lines
Fixes 0e8fb7ba7ca5 ("drm/i915/skl: Flush the WM configuration")Fixes 8211bd5bdf5e ("drm/i915/skl: Program the DDB allocation")[omitting CC for stable, since this patch will need to be changed for such backports first]
This series breaks on kms_atomic_transition.plane-all-transition (just uploaded the changed tests to igt, please rebuild)
[ 5455.543871] [drm:verify_wm_state.isra.72 [i915]] *ERROR* mismatch in DDB state pipe A plane 1 (expected (0,0), found (0,860))
There's also a WARN_ON(... && total_data_rate == 0) which you need to comment out for the tests to pass cleanly.
~Maarten
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for Finally fix watermarks (rev8)
In reply to Lyude== Series Details ==
== Series Details ==
Series: Finally fix watermarks (rev8)
URL : https://patchwork.freedesktop.org/series/10276/
State : failure
== Summary ==
Series 10276v8 Finally fix watermarks
http://patchwork.freedesktop.org/api/1.0/series/10276/revisions/8/mbox
Test gem_exec_suspend:
Subgroup basic-s3:
dmesg-warn -> PASS (fi-skl-i5-6260u)
dmesg-warn -> PASS (fi-skl-i7-6700k)
Test kms_cursor_legacy:
Subgroup basic-cursor-vs-flip-varying-size:
fail -> PASS (ro-byt-n2820)
Subgroup basic-flip-vs-cursor-legacy:
fail -> PASS (ro-bdw-i5-5250u)
dmesg-fail -> FAIL (fi-skl-i7-6700k)
Subgroup basic-flip-vs-cursor-varying-size:
fail -> PASS (ro-hsw-i7-4770r)
pass -> FAIL (fi-skl-i7-6700k)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
dmesg-warn -> PASS (ro-bdw-i7-5600u)
dmesg-warn -> PASS (fi-skl-i5-6260u)
dmesg-warn -> PASS (fi-skl-i7-6700k)
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> PASS (fi-skl-i5-6260u)
dmesg-warn -> PASS (fi-skl-i7-6700k)
Subgroup suspend-read-crc-pipe-c:
dmesg-warn -> PASS (fi-skl-i5-6260u)
dmesg-warn -> PASS (fi-skl-i7-6700k)fi-kbl-qkkr total:244 pass:186 dwarn:28 dfail:0 fail:3 skip:27 fi-skl-i5-6260u total:244 pass:228 dwarn:0 dfail:0 fail:2 skip:14 fi-skl-i7-6700k total:244 pass:212 dwarn:0 dfail:0 fail:4 skip:28 fi-snb-i7-2600 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:42 ro-bdw-i5-5250u total:240 pass:219 dwarn:3 dfail:0 fail:1 skip:17 ro-bdw-i7-5557U total:240 pass:220 dwarn:1 dfail:0 fail:0 skip:19 ro-bdw-i7-5600u total:240 pass:207 dwarn:0 dfail:0 fail:1 skip:32 ro-bsw-n3050 total:240 pass:194 dwarn:0 dfail:0 fail:4 skip:42 ro-byt-n2820 total:240 pass:197 dwarn:0 dfail:0 fail:3 skip:40 ro-hsw-i3-4010u total:240 pass:214 dwarn:0 dfail:0 fail:0 skip:26 ro-hsw-i7-4770r total:240 pass:214 dwarn:0 dfail:0 fail:0 skip:26 ro-ilk1-i5-650 total:235 pass:173 dwarn:0 dfail:0 fail:2 skip:60 ro-ivb-i7-3770 total:240 pass:205 dwarn:0 dfail:0 fail:0 skip:35 ro-ivb2-i7-3770 total:240 pass:209 dwarn:0 dfail:0 fail:0 skip:31 ro-skl3-i5-6260u total:240 pass:222 dwarn:0 dfail:0 fail:4 skip:14
Results at /archive/results/CI_IGT_test/RO_Patchwork_1819/
8e34143 drm-intel-nightly: 2016y-08m-10d-13h-03m-18s UTC integration manifest 663a9eb drm/i915/skl: Update DDB values atomically with wms/plane attrs 4fb278a drm/i915: Move CRTC updating in atomic_commit into it's own hook 9e7fca1 drm/i915/skl: Ensure pipes with changed wms get added to the state cbd531d drm/i915/skl: Update plane watermarks atomically during plane updates 58e6fa3 drm/i915/gen9: Only copy WM results for changed pipes to skl_hw a6e824d drm/i915/skl: Add support for the SAGV, fix underrun hangs
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx