drm/vblank: allow dynamic per-crtc vblank off delay
Subsystems (4)
PATCH 1/2 drm/vblank: allow dynamic per-crtc vblank off delay
We would like to be able to adjust the vblank off delay dynamically for a given CRTC. Since, it will allow drivers to apply static screen optimizations more quickly and consequently allow users to benefit more so from the power savings afforded by the aforementioned optimizations.
--- drivers/gpu/drm/drm_vblank.c | 31 ++++++++++++++++++++++++++----- include/drm/drm_vblank.h | 7 +++++++ 2 files changed, 33 insertions(+), 5 deletions(-)
drivers/gpu/drm/drm_vblank.c +26 -5
@@ -529,6 +529,7 @@ int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs) vblank->dev = dev; vblank->pipe = i; + vblank->offdelay_ms = drm_vblank_offdelay;init_waitqueue_head (&vblank->queue);timer_setup (&vblank->disable_timer, vblank_disable_fn,0 );seqlock_init (&vblank->seqlock);
@@ -1229,6 +1230,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_get);void drm_vblank_put (struct drm_device *dev,unsigned int pipe) {struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; +int vblank_offdelay = vblank->offdelay_ms;if (drm_WARN_ON (dev, pipe >= dev->num_crtcs))return ;
@@ -1238,13 +1240,13 @@ void drm_vblank_put(struct drm_device *dev, unsigned int pipe)/* Last user schedules interrupt disable */ if (atomic_dec_and_test (&vblank->refcount)) { -if (drm_vblank_offdelay ==0 ) +if (!vblank_offdelay)return ; -else if (drm_vblank_offdelay <0 ) +else if (vblank_offdelay <0 )vblank_disable_fn (&vblank->disable_timer);else if (!dev->vblank_disable_immediate)mod_timer (&vblank->disable_timer, - jiffies + ((drm_vblank_offdelay *HZ )/1000 )); + jiffies + ((vblank_offdelay *HZ ) /1000 )); } }
@@ -1455,6 +1457,25 @@ void drm_crtc_set_max_vblank_count(struct drm_crtc *crtc, }EXPORT_SYMBOL (drm_crtc_set_max_vblank_count); +/** +* drm_crtc_set_vblank_offdelay - configure the vblank off delay value +* @crtc: CRTC in question +* @offdelay: off delay value +* +* If used, must be called before drm_vblank_on(). +*/ +void drm_crtc_set_vblank_offdelay (struct drm_crtc *crtc,int offdelay) +{ +struct drm_device *dev = crtc->dev; +unsigned int pipe =drm_crtc_index (crtc); +struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; + +drm_WARN_ON (dev, dev->vblank_disable_immediate); + + vblank->offdelay_ms = offdelay; +} +EXPORT_SYMBOL (drm_crtc_set_vblank_offdelay); +/** * drm_crtc_vblank_on - enable vblank events on a CRTC * @crtc: CRTC in question
@@ -1490,7 +1511,7 @@ void drm_crtc_vblank_on(struct drm_crtc *crtc)* re-enable interrupts if there are users left, or the * user wishes vblank interrupts to be enabled all the time. */ -if (atomic_read (&vblank->refcount) !=0 || drm_vblank_offdelay ==0 ) +if (atomic_read (&vblank->refcount) !=0 || !vblank->offdelay_ms)drm_WARN_ON (dev,drm_vblank_enable (dev, pipe));spin_unlock_irq (&dev->vbl_lock); }
@@ -1909,7 +1930,7 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)* drm_handle_vblank_events) so that the timestamp is always accurate. */ disable_irq = (dev->vblank_disable_immediate && - drm_vblank_offdelay >0 && + vblank->offdelay_ms >0 && !atomic_read (&vblank->refcount));drm_handle_vblank_events (dev, pipe);
include/drm/drm_vblank.h +7 -0
@@ -187,6 +187,12 @@ struct drm_vblank_crtc {*/ int linedur_ns; +/** +* @offdelay_ms: Vblank off delay in ms, used to determine how long +* @disable_timer waits before disabling. +*/ +int offdelay_ms; +/** * @hwmode: *
@@ -255,6 +261,7 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc,wait_queue_head_t *drm_crtc_vblank_waitqueue (struct drm_crtc *crtc);void drm_crtc_set_max_vblank_count (struct drm_crtc *crtc,u32 max_vblank_count); +void drm_crtc_set_vblank_offdelay (struct drm_crtc *crtc,int offdelay);/* * Helpers for struct drm_crtc_funcs
Signature · 1 line
2.45.1
PATCH 2/2 drm/amd/display: use drm_crtc_set_vblank_offdelay()
Hook up drm_crtc_set_vblank_offdelay() in amdgpu_dm, so that we can enable PSR more quickly for displays that support it.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +22 -8
@@ -8231,7 +8231,7 @@ static int amdgpu_dm_encoder_init(struct drm_device *dev,static void manage_dm_interrupts (struct amdgpu_device *adev,struct amdgpu_crtc *acrtc, -bool enable) +struct dm_crtc_state *acrtc_state) {/* * We have no guarantee that the frontend index maps to the same
@@ -8239,12 +8239,25 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,* * TODO: Use a different interrupt or check DC itself for the mapping. */ -int irq_type = -amdgpu_display_crtc_idx_to_irq_type ( - adev, - acrtc->crtc_id); +int irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, + acrtc->crtc_id); +struct dc_crtc_timing *timing; +int offdelay; + +if (acrtc_state) { + timing = &acrtc_state->stream->timing; + +/* at least 2 frames */ + offdelay =2000 /div64_u64 (div64_u64 ((timing->pix_clk_100hz * + (uint64_t )100 ), + timing->v_total), + timing->h_total) +1 ; + +if (acrtc_state->stream->link->psr_settings.psr_version < +DC_PSR_VERSION_UNSUPPORTED && +amdgpu_ip_version (adev,DCE_HWIP ,0 ) >=IP_VERSION (3 ,5 ,0 )) +drm_crtc_set_vblank_offdelay (&acrtc->base, offdelay); -if (enable) {drm_crtc_vblank_on (&acrtc->base); amdgpu_irq_get( adev,
@@ -9319,7 +9332,7 @@ static void amdgpu_dm_commit_streams(struct drm_atomic_state *state,if (old_crtc_state->active && (!new_crtc_state->active ||drm_atomic_crtc_needs_modeset (new_crtc_state))) { -manage_dm_interrupts (adev, acrtc, false); +manage_dm_interrupts (adev, acrtc,NULL );dc_stream_release (dm_old_crtc_state->stream); } }
@@ -9834,7 +9847,8 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) drm_atomic_crtc_needs_modeset(new_crtc_state))) {dc_stream_retain (dm_new_crtc_state->stream); acrtc->dm_irq_params.stream = dm_new_crtc_state->stream; -manage_dm_interrupts (adev, acrtc, true); +manage_dm_interrupts (adev, acrtc, +to_dm_crtc_state (new_crtc_state)); }/* Handle vrr on->off / off->on transitions */ amdgpu_dm_handle_vrr_transition (dm_old_crtc_state, dm_new_crtc_state);
Signature · 1 line
2.45.1
Re: [PATCH 2/2] drm/amd/display: use drm_crtc_set_vblank_offdelay()
Quoted 32 lines · Hamza Mahfooz
Hook up
drm_crtc_set_vblank_offdelay()inamdgpu_dm, so that we can enable PSR more quickly for displays that support it.Signed-off-by Hamza Mahfooz <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-5@@ -8231,7 +8231,7 @@ static int amdgpu_dm_encoder_init(struct drm_device *dev,static void manage_dm_interrupts (struct amdgpu_device *adev,struct amdgpu_crtc *acrtc, -bool enable) +struct dm_crtc_state *acrtc_state) {/* * We have no guarantee that the frontend index maps to the same @@ -8239,12 +8239,25 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,* * TODO: Use a different interrupt or check DC itself for the mapping. */ -int irq_type = -amdgpu_display_crtc_idx_to_irq_type ( - adev, - acrtc->crtc_id); +int irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, + acrtc->crtc_id); +struct dc_crtc_timing *timing;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void manage_dm_interrupts(struct amdgpu_device *adev, · line 8254
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-0+int offdelay; + +if (acrtc_state) { + timing = &acrtc_state->stream->timing; + +/* at least 2 frames */ + offdelay =2000 /div64_u64 (div64_u64 ((timing->pix_clk_100hz * + (uint64_t )100 ), + timing->v_total), + timing->h_total) +1 ;
Yeah, _especially_ when you have a this short timeout your really have to instead fix the vblank driver code properly so you can enable vblank_disable_immediate. This is just cheating :-)
-Sima
Quoted 32 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-3+ +if (acrtc_state->stream->link->psr_settings.psr_version < +DC_PSR_VERSION_UNSUPPORTED && +amdgpu_ip_version (adev,DCE_HWIP ,0 ) >=IP_VERSION (3 ,5 ,0 )) +drm_crtc_set_vblank_offdelay (&acrtc->base, offdelay); -if (enable) {drm_crtc_vblank_on (&acrtc->base); amdgpu_irq_get( adev,@@ -9319,7 +9332,7 @@ static void amdgpu_dm_commit_streams(struct drm_atomic_state *state,if (old_crtc_state->active && (!new_crtc_state->active ||drm_atomic_crtc_needs_modeset (new_crtc_state))) { -manage_dm_interrupts (adev, acrtc, false); +manage_dm_interrupts (adev, acrtc,NULL );dc_stream_release (dm_old_crtc_state->stream); } }@@ -9834,7 +9847,8 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) drm_atomic_crtc_needs_modeset(new_crtc_state))) {dc_stream_retain (dm_new_crtc_state->stream); acrtc->dm_irq_params.stream = dm_new_crtc_state->stream; -manage_dm_interrupts (adev, acrtc, true); +manage_dm_interrupts (adev, acrtc, +to_dm_crtc_state (new_crtc_state)); }/* Handle vrr on->off / off->on transitions */ amdgpu_dm_handle_vrr_transition (dm_old_crtc_state, dm_new_crtc_state);Signature · 1 line
2.45.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH 2/2] drm/amd/display: use drm_crtc_set_vblank_offdelay()
Quoted 39 lines · Daniel Vetter
Quoted 38 lines · Hamza Mahfooz
Hook up
drm_crtc_set_vblank_offdelay()inamdgpu_dm, so that we can enable PSR more quickly for displays that support it.Signed-off-by Hamza Mahfooz <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-5@@ -8231,7 +8231,7 @@ static int amdgpu_dm_encoder_init(struct drm_device *dev,static void manage_dm_interrupts (struct amdgpu_device *adev,struct amdgpu_crtc *acrtc, -bool enable) +struct dm_crtc_state *acrtc_state) {/* * We have no guarantee that the frontend index maps to the same @@ -8239,12 +8239,25 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,* * TODO: Use a different interrupt or check DC itself for the mapping. */ -int irq_type = -amdgpu_display_crtc_idx_to_irq_type ( - adev, - acrtc->crtc_id); +int irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, + acrtc->crtc_id); +struct dc_crtc_timing *timing; +int offdelay; + +if (acrtc_state) { + timing = &acrtc_state->stream->timing; + +/* at least 2 frames */
Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void manage_dm_interrupts(struct amdgpu_device *adev, · line 8254
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-0+ offdelay =2000 /div64_u64 (div64_u64 ((timing->pix_clk_100hz * + (uint64_t )100 ), + timing->v_total), + timing->h_total) +1 ;Yeah, _especially_ when you have a this short timeout your really have to instead fix the vblank driver code properly so you can enable
vblank_disable_immediate. This is just cheating :-)
Michel mentioned on irc that DC had immediate vblank disabling, but this was reverted with f64e6e0b6afe ("Revert "drm/amdgpu/display: set vblank_disable_immediate for DC"").
I haven't looked at the details of the bug report, but stuttering is exactly what happens when the driver's vblank code has these races. Going for a very low timeout instead of zero just means it's a bit harder to hit the issue, and much, much harder to debug properly.
So yeah even more reasons to look at the underlying root-cause here I think.
-Sima
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH 2/2] drm/amd/display: use drm_crtc_set_vblank_offdelay()
Quoted 53 lines · Daniel Vetter
Quoted 39 lines · Daniel Vetter
Quoted 38 lines · Hamza Mahfooz
Hook up
drm_crtc_set_vblank_offdelay()inamdgpu_dm, so that we can enable PSR more quickly for displays that support it.Signed-off-by Hamza Mahfooz <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-5@@ -8231,7 +8231,7 @@ static int amdgpu_dm_encoder_init(struct drm_device *dev,static void manage_dm_interrupts (struct amdgpu_device *adev,struct amdgpu_crtc *acrtc, -bool enable) +struct dm_crtc_state *acrtc_state) {/* * We have no guarantee that the frontend index maps to the same @@ -8239,12 +8239,25 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,* * TODO: Use a different interrupt or check DC itself for the mapping. */ -int irq_type = -amdgpu_display_crtc_idx_to_irq_type ( - adev, - acrtc->crtc_id); +int irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, + acrtc->crtc_id); +struct dc_crtc_timing *timing; +int offdelay; + +if (acrtc_state) { + timing = &acrtc_state->stream->timing; + +/* at least 2 frames */ Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void manage_dm_interrupts(struct amdgpu_device *adev, · line 8254
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-0+ offdelay =2000 /div64_u64 (div64_u64 ((timing->pix_clk_100hz * + (uint64_t )100 ), + timing->v_total), + timing->h_total) +1 ;Yeah, _especially_ when you have a this short timeout your really have to instead fix the vblank driver code properly so you can enable
vblank_disable_immediate. This is just cheating :-)Michel mentioned on irc that DC had immediate vblank disabling, but this was reverted with
f64e6e0b6afe("Revert "drm/amdgpu/display: setvblank_disable_immediatefor DC"").
Quoted 8 lines
I haven't looked at the details of the bug report, but stuttering is exactly what happens when the driver's vblank code has these races. Going for a very low timeout instead of zero just means it's a bit harder to hit the issue, and much, much harder to debug properly.
So yeah even more reasons to look at the underlying root-cause here I think.
-Sima
The issue is that DMUB (display firmware) isn't able to keep up with all of the requests that the driver is making. The issue is fairly difficult to reproduce (I've only seen it once after letting the system run with a program that would engage PSR every so often, after several hours). It is also worth noting that we have the same 2 idle frame wait on the windows driver, for the same reasons. So, in all likelihood if it is your opinion that the series should be NAKed, we will probably have to move the wait into the driver as a workaround.
Signature · 1 line
Hamza
Re: [PATCH 2/2] drm/amd/display: use drm_crtc_set_vblank_offdelay()
Quoted 62 lines · Hamza Mahfooz
Quoted 52 lines · Daniel Vetter
Quoted 38 lines · Daniel Vetter
Quoted 37 lines · Hamza Mahfooz
Hook up
drm_crtc_set_vblank_offdelay()inamdgpu_dm, so that we can enable PSR more quickly for displays that support it.Signed-off-by Hamza Mahfooz <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-5@@ -8231,7 +8231,7 @@ static int amdgpu_dm_encoder_init(struct drm_device *dev,static void manage_dm_interrupts (struct amdgpu_device *adev,struct amdgpu_crtc *acrtc, -bool enable) +struct dm_crtc_state *acrtc_state) {/* * We have no guarantee that the frontend index maps to the same @@ -8239,12 +8239,25 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,* * TODO: Use a different interrupt or check DC itself for the mapping. */ -int irq_type = -amdgpu_display_crtc_idx_to_irq_type ( - adev, - acrtc->crtc_id); +int irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, + acrtc->crtc_id); +struct dc_crtc_timing *timing; +int offdelay; + +if (acrtc_state) { + timing = &acrtc_state->stream->timing; + +/* at least 2 frames */ Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void manage_dm_interrupts(struct amdgpu_device *adev, · line 8254
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-0+ offdelay =2000 /div64_u64 (div64_u64 ((timing->pix_clk_100hz * + (uint64_t )100 ), + timing->v_total), + timing->h_total) +1 ;Yeah, _especially_ when you have a this short timeout your really have to instead fix the vblank driver code properly so you can enable
vblank_disable_immediate. This is just cheating :-)Michel mentioned on irc that DC had immediate vblank disabling, but this was reverted with
f64e6e0b6afe("Revert "drm/amdgpu/display: setvblank_disable_immediatefor DC"").Quoted 8 lines
I haven't looked at the details of the bug report, but stuttering is exactly what happens when the driver's vblank code has these races. Going for a very low timeout instead of zero just means it's a bit harder to hit the issue, and much, much harder to debug properly.
So yeah even more reasons to look at the underlying root-cause here I think.
-Sima
Quoted 10 lines
The issue is that DMUB (display firmware) isn't able to keep up with all of the requests that the driver is making. The issue is fairly difficult to reproduce (I've only seen it once after letting the system run with a program that would engage PSR every so often, after several hours). It is also worth noting that we have the same 2 idle frame wait on the windows
driver, for the same reasons. So, in all likelihood if it is your opinion that
the series should be NAKed, we will probably have to move the wait into the driver as a workaround.
Well that's an entirely different reason, and needs to be recorded in the commit log that disabling/enabling vblank is too expensive and why. Also would be good to record that windows does the same.
I'm also not entirely sure this is a good interface, so some thoughts/question:
- is the issue only with psr, meaning that if we switch the panel to a different crtc, do we need to update the off delay.
- there's still the question of why vblank_immediate_disable resulted in stuttering, is that the same bug? I think for consistency it'd be best if we enable immediate vblank disabling everywhere (for maximum testing), and then apply the 2 frame delay workaround only where needed explicitly. Otherwise if there's other issues than DMUB being slow, they might be mostly hidden and become really hard to track down when they show up.
- I think an interface to set the right values in lockstep with the vblank on/off state would be best, so maybe a special drm_crtc_vblank_on_config that takes additional parameters?
Cheers, Sima
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH 2/2] drm/amd/display: use drm_crtc_set_vblank_offdelay()
Quoted 74 lines · Daniel Vetter
Quoted 62 lines · Hamza Mahfooz
Quoted 52 lines · Daniel Vetter
Quoted 38 lines · Daniel Vetter
Quoted 37 lines · Hamza Mahfooz
Hook up
drm_crtc_set_vblank_offdelay()inamdgpu_dm, so that we can enable PSR more quickly for displays that support it.Signed-off-by Hamza Mahfooz <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-5@@ -8231,7 +8231,7 @@ static int amdgpu_dm_encoder_init(struct drm_device *dev,static void manage_dm_interrupts (struct amdgpu_device *adev,struct amdgpu_crtc *acrtc, -bool enable) +struct dm_crtc_state *acrtc_state) {/* * We have no guarantee that the frontend index maps to the same @@ -8239,12 +8239,25 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,* * TODO: Use a different interrupt or check DC itself for the mapping. */ -int irq_type = -amdgpu_display_crtc_idx_to_irq_type ( - adev, - acrtc->crtc_id); +int irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, + acrtc->crtc_id); +struct dc_crtc_timing *timing; +int offdelay; + +if (acrtc_state) { + timing = &acrtc_state->stream->timing; + +/* at least 2 frames */ Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void manage_dm_interrupts(struct amdgpu_device *adev, · line 8254
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-0+ offdelay =2000 /div64_u64 (div64_u64 ((timing->pix_clk_100hz * + (uint64_t )100 ), + timing->v_total), + timing->h_total) +1 ;Yeah, _especially_ when you have a this short timeout your really have to instead fix the vblank driver code properly so you can enable
vblank_disable_immediate. This is just cheating :-)Michel mentioned on irc that DC had immediate vblank disabling, but this was reverted with
f64e6e0b6afe("Revert "drm/amdgpu/display: setvblank_disable_immediatefor DC"").Quoted 8 lines
I haven't looked at the details of the bug report, but stuttering is exactly what happens when the driver's vblank code has these races. Going for a very low timeout instead of zero just means it's a bit harder to hit the issue, and much, much harder to debug properly.
So yeah even more reasons to look at the underlying root-cause here I think.
-SimaQuoted 10 lines
The issue is that DMUB (display firmware) isn't able to keep up with all of the requests that the driver is making. The issue is fairly difficult to reproduce (I've only seen it once after letting the system run with a program that would engage PSR every so often, after several hours). It is also worth noting that we have the same 2 idle frame wait on the windows
driver, for the same reasons. So, in all likelihood if it is your opinion that
the series should be NAKed, we will probably have to move the wait into the driver as a workaround.
Quoted 3 lines
Well that's an entirely different reason, and needs to be recorded in the commit log that disabling/enabling vblank is too expensive and why. Also would be good to record that windows does the same.
Point taken.
Quoted 6 lines
I'm also not entirely sure this is a good interface, so some thoughts/question:
- is the issue only with psr, meaning that if we switch the panel to a different crtc, do we need to update the off delay.
I can't say definitively, but all of the public reports (that I've seen) and my local repro are PSR related.
Quoted 8 lines
- there's still the question of why
vblank_immediate_disableresulted in stuttering, is that the same bug? I think for consistency it'd be best if we enable immediate vblank disabling everywhere (for maximum testing), and then apply the 2 frame delay workaround only where needed explicitly. Otherwise if there's other issues than DMUB being slow, they might be mostly hidden and become really hard to track down when they show up.
Ya, I believe they are all DMUB related since the stuttering issues are accompanied by the following dmesg log entry:
[drm:dc_dmub_srv_wait_idle [amdgpu]] *ERROR* Error waiting for DMUB idle: status=3
(which is pretty much an unspecified firmware timeout)
Also, setting vblank_immediate_disable unconditionally for amdgpu, while only enabling the delay for cases that we know that we need it seems reasonable to me.
Quoted 4 lines
- I think an interface to set the right values in lockstep with the vblank on/off state would be best, so maybe a special
drm_crtc_vblank_on_configthat takes additional parameters?
Sure, that seems fine, what parameters besides the off delay did you have in mind though?
Quoted 2 lines
Cheers, Sima
Signature · 1 line
Hamza
Re: [PATCH 2/2] drm/amd/display: use drm_crtc_set_vblank_offdelay()
Quoted 100 lines · Hamza Mahfooz
Quoted 74 lines · Daniel Vetter
Quoted 62 lines · Hamza Mahfooz
Quoted 52 lines · Daniel Vetter
Quoted 38 lines · Daniel Vetter
Quoted 37 lines · Hamza Mahfooz
Hook up
drm_crtc_set_vblank_offdelay()inamdgpu_dm, so that we can enable PSR more quickly for displays that support it.Signed-off-by Hamza Mahfooz <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-5@@ -8231,7 +8231,7 @@ static int amdgpu_dm_encoder_init(struct drm_device *dev,static void manage_dm_interrupts (struct amdgpu_device *adev,struct amdgpu_crtc *acrtc, -bool enable) +struct dm_crtc_state *acrtc_state) {/* * We have no guarantee that the frontend index maps to the same @@ -8239,12 +8239,25 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,* * TODO: Use a different interrupt or check DC itself for the mapping. */ -int irq_type = -amdgpu_display_crtc_idx_to_irq_type ( - adev, - acrtc->crtc_id); +int irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, + acrtc->crtc_id); +struct dc_crtc_timing *timing; +int offdelay; + +if (acrtc_state) { + timing = &acrtc_state->stream->timing; + +/* at least 2 frames */ Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void manage_dm_interrupts(struct amdgpu_device *adev, · line 8254
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-0+ offdelay =2000 /div64_u64 (div64_u64 ((timing->pix_clk_100hz * + (uint64_t )100 ), + timing->v_total), + timing->h_total) +1 ;Yeah, _especially_ when you have a this short timeout your really have to instead fix the vblank driver code properly so you can enable
vblank_disable_immediate. This is just cheating :-)Michel mentioned on irc that DC had immediate vblank disabling, but this was reverted with
f64e6e0b6afe("Revert "drm/amdgpu/display: setvblank_disable_immediatefor DC"").Quoted 8 lines
I haven't looked at the details of the bug report, but stuttering is exactly what happens when the driver's vblank code has these races. Going for a very low timeout instead of zero just means it's a bit harder to hit the issue, and much, much harder to debug properly.
So yeah even more reasons to look at the underlying root-cause here I think.
-SimaQuoted 10 lines
The issue is that DMUB (display firmware) isn't able to keep up with all of the requests that the driver is making. The issue is fairly difficult to reproduce (I've only seen it once after letting the system run with a program that would engage PSR every so often, after several hours). It is also worth noting that we have the same 2 idle frame wait on the windows
driver, for the same reasons. So, in all likelihood if it is your opinion that
the series should be NAKed, we will probably have to move the wait into the driver as a workaround.Quoted 3 lines
Well that's an entirely different reason, and needs to be recorded in the commit log that disabling/enabling vblank is too expensive and why. Also would be good to record that windows does the same.
Point taken.
Quoted 6 lines
I'm also not entirely sure this is a good interface, so some thoughts/question:
- is the issue only with psr, meaning that if we switch the panel to a different crtc, do we need to update the off delay.
I can't say definitively, but all of the public reports (that I've seen) and my local repro are PSR related.
Quoted 8 lines
- there's still the question of why
vblank_immediate_disableresulted in stuttering, is that the same bug? I think for consistency it'd be best if we enable immediate vblank disabling everywhere (for maximum testing), and then apply the 2 frame delay workaround only where needed explicitly. Otherwise if there's other issues than DMUB being slow, they might be mostly hidden and become really hard to track down when they show up.
Quoted 7 lines
Ya, I believe they are all DMUB related since the stuttering issues are accompanied by the following dmesg log entry:
[drm:dc_dmub_srv_wait_idle [amdgpu]] *ERROR* Error waiting for DMUB idle:
status=3(which is pretty much an unspecified firmware timeout)
Ah that would be really good to add to the commit message, should help connect with any bug reports later on. And the firmware handling PSR specially also makes sense, the flow is a lot more involved for that I guess.
Quoted 6 lines
Also, setting
vblank_immediate_disableunconditionally for amdgpu, while only
enabling the delay for cases that we know that we need it seems reasonable to me.Quoted 1 line
Quoted 6 lines
Quoted 3 lines
- I think an interface to set the right values in lockstep with the vblank on/off state would be best, so maybe a special
drm_crtc_vblank_on_configthat takes additional parameters?Sure, that seems fine, what parameters besides the off delay did you have in mind though?
Whatever you need, sounds like you need to update both the off delay and the immediate disable (or maybe we just magically put them into the same value, dunno). I just thought that supplying the right parameters to drm_crtc_vblank_on is probably the right way to go about this.
Note that there's the question of whether drm_crtc_vblank_off should restore the old values, or whether drivers simply have to use that special version unconditionally, instead of only for the outputs like PSR that need special handling.
Cheers, Sima
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 6 lines · Hamza Mahfooz
We would like to be able to adjust the vblank off delay dynamically for a given CRTC. Since, it will allow drivers to apply static screen optimizations more quickly and consequently allow users to benefit more so from the power savings afforded by the aforementioned optimizations.
Signed-off-by Hamza Mahfooz <[email protected]>
So the vblank off delay is a hack to work around driver bugs/races, where immediately disabling the vblank interrupt might result in under/overcounting vblanks. Which really confuses compositors. The timeout is chosen to be long enough that any miscounting should never end up confusing userspace, so you can't just change it as a power optimization.
The right way to fix this is to work your driver so that you can set vblank_disable_immediate = true, which amdgpu does for at least some generations. The right fix here is to make sure you have that enabled on all platforms correctly (which means the vblank interrupt race needs to be properly fixed in driver code, which requires some deep hw knowledge of when exactly the various registers update an interrupts fire). The kerneldoc for vblank_disable_immedate and the other pieces it references should expain the details.
tldr; nak on this approach.
Cheers, Sima
Quoted 114 lines
--- drivers/gpu/drm/drm_vblank.c | 31 ++++++++++++++++++++++++++----- include/drm/drm_vblank.h | 7 +++++++ 2 files changed, 33 insertions(+), 5 deletions(-)drivers/gpu/drm/drm_vblank.c +26
-5@@ -529,6 +529,7 @@ int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs) vblank->dev = dev; vblank->pipe = i; + vblank->offdelay_ms = drm_vblank_offdelay;init_waitqueue_head (&vblank->queue);timer_setup (&vblank->disable_timer, vblank_disable_fn,0 );seqlock_init (&vblank->seqlock);@@ -1229,6 +1230,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_get);void drm_vblank_put (struct drm_device *dev,unsigned int pipe) {struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; +int vblank_offdelay = vblank->offdelay_ms;if (drm_WARN_ON (dev, pipe >= dev->num_crtcs))return ;@@ -1238,13 +1240,13 @@ void drm_vblank_put(struct drm_device *dev, unsigned int pipe)/* Last user schedules interrupt disable */ if (atomic_dec_and_test (&vblank->refcount)) { -if (drm_vblank_offdelay ==0 ) +if (!vblank_offdelay)return ; -else if (drm_vblank_offdelay <0 ) +else if (vblank_offdelay <0 )vblank_disable_fn (&vblank->disable_timer);else if (!dev->vblank_disable_immediate)mod_timer (&vblank->disable_timer, - jiffies + ((drm_vblank_offdelay *HZ )/1000 )); + jiffies + ((vblank_offdelay *HZ ) /1000 )); } }@@ -1455,6 +1457,25 @@ void drm_crtc_set_max_vblank_count(struct drm_crtc *crtc, }EXPORT_SYMBOL (drm_crtc_set_max_vblank_count); +/** +* drm_crtc_set_vblank_offdelay - configure the vblank off delay value +* @crtc: CRTC in question +* @offdelay: off delay value +* +* If used, must be called before drm_vblank_on(). +*/ +void drm_crtc_set_vblank_offdelay (struct drm_crtc *crtc,int offdelay) +{ +struct drm_device *dev = crtc->dev; +unsigned int pipe =drm_crtc_index (crtc); +struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; + +drm_WARN_ON (dev, dev->vblank_disable_immediate); + + vblank->offdelay_ms = offdelay; +} +EXPORT_SYMBOL (drm_crtc_set_vblank_offdelay); +/** * drm_crtc_vblank_on - enable vblank events on a CRTC * @crtc: CRTC in question @@ -1490,7 +1511,7 @@ void drm_crtc_vblank_on(struct drm_crtc *crtc)* re-enable interrupts if there are users left, or the * user wishes vblank interrupts to be enabled all the time. */ -if (atomic_read (&vblank->refcount) !=0 || drm_vblank_offdelay ==0 ) +if (atomic_read (&vblank->refcount) !=0 || !vblank->offdelay_ms)drm_WARN_ON (dev,drm_vblank_enable (dev, pipe));spin_unlock_irq (&dev->vbl_lock); }@@ -1909,7 +1930,7 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)* drm_handle_vblank_events) so that the timestamp is always accurate. */ disable_irq = (dev->vblank_disable_immediate && - drm_vblank_offdelay >0 && + vblank->offdelay_ms >0 && !atomic_read (&vblank->refcount));drm_handle_vblank_events (dev, pipe);include/drm/drm_vblank.h +7
-0@@ -187,6 +187,12 @@ struct drm_vblank_crtc {*/ int linedur_ns; +/** +* @offdelay_ms: Vblank off delay in ms, used to determine how long +* @disable_timer waits before disabling. +*/ +int offdelay_ms; +/** * @hwmode: * @@ -255,6 +261,7 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc,wait_queue_head_t *drm_crtc_vblank_waitqueue (struct drm_crtc *crtc);void drm_crtc_set_max_vblank_count (struct drm_crtc *crtc,u32 max_vblank_count); +void drm_crtc_set_vblank_offdelay (struct drm_crtc *crtc,int offdelay);/* * Helpers for struct drm_crtc_funcs Signature · 1 line
2.45.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch