drm/vkms: guarantee vblank when capturing crc
Melissa Wen
reviewerPATCH 1/1 drm/vkms: guarantee vblank when capturing crc
VKMS needs vblank interrupts enabled to capture CRC. When vblank is disabled, tests like kms_cursor_crc and kms_pipe_crc_basic getting stuck waiting for a capture that will not occur until vkms wakes up. This patch ensures that vblank remains enabled as long as the CRC capture is needed.
It clears the execution of the following kms_cursor_crc subtests:
1. pipe-A-cursor-[size,alpha-opaque, NxN-(on-screen, off-screen, sliding, random, fast-moving])] - successful when running individually.
2. pipe-A-cursor-dpms passes again
3. pipe-A-cursor-suspend also passes
The issue was initially tracked in the sequential execution of IGT kms_cursor_crc subtest: when running the test sequence or one of its subtests twice, the odd execs complete and the pairs get stuck in an endless wait. In the IGT code, calling a wait_for_vblank on preparing for CRC capture prevented the busy-wait. But the problem persisted in the pipe-A-cursor-dpms and -suspend subtests.
Checking the history, the pipe-A-cursor-dpms subtest was successful when, in vkms_atomic_commit_tail, instead of using the flip_done op, it used wait_for_vblanks. Another way to prevent blocking was wait_one_vblank when enabling crtc. However, in both cases, pipe-A-cursor-suspend persisted blocking in the 2nd start of CRC capture, which may indicate that something got stuck in the step of CRC setup. Indeed, wait_one_vblank in the crc setup was able to sync things and free all kms_cursor_crc subtests.
Besides, other alternatives to force enabling vblanks or prevent disabling them such as calling drm_crtc_put_vblank or modeset_enables before commit_planes + offdelay = 0, also unlock all subtests executions. These facts together converge on the lack of vblank to unblock the crc capture.
Finally, considering the vkms's dependence on vblank interruptions to perform tasks, this patch acquires a vblank ref when setup CRC source and releases ref when disabling crc capture, ensuring vblanks happen to compute CRC.
--- drivers/gpu/drm/vkms/vkms_composer.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/vkms/vkms_composer.c +8 -0
@@ -241,6 +241,14 @@ int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) ret =vkms_crc_parse_source (src_name, &enabled); +/* Ensure that vblank interruptions are enabled for crc capture */ +/* Enabling CRC: acquire vblank ref */ +if (enabled) +drm_crtc_vblank_get (crtc); +/* Disabling CRC: release vblank ref */ +if (!src_name) +drm_crtc_vblank_put (crtc); +spin_lock_irq (&out->lock); out->composer_enabled = enabled;spin_unlock_irq (&out->lock);
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 39 lines · Melissa Wen
VKMS needs vblank interrupts enabled to capture CRC. When vblank is disabled, tests like
kms_cursor_crcandkms_pipe_crc_basicgetting stuck waiting for a capture that will not occur until vkms wakes up. This patch ensures that vblank remains enabled as long as the CRC capture is needed.It clears the execution of the following
kms_cursor_crcsubtests:
1. pipe-A-cursor-[size,alpha-opaque, NxN-(on-screen, off-screen, sliding, random, fast-moving])] - successful when running individually.
2. pipe-A-cursor-dpms passes again
3. pipe-A-cursor-suspend also passesThe issue was initially tracked in the sequential execution of IGT
kms_cursor_crcsubtest: when running the test sequence or one of its subtests twice, the odd execs complete and the pairs get stuck in an endless wait. In the IGT code, calling await_for_vblankon preparing for CRC capture prevented the busy-wait. But the problem persisted in the pipe-A-cursor-dpms and -suspend subtests.Checking the history, the pipe-A-cursor-dpms subtest was successful when, in
vkms_atomic_commit_tail, instead of using theflip_doneop, it usedwait_for_vblanks. Another way to prevent blocking waswait_one_vblankwhen enabling crtc. However, in both cases, pipe-A-cursor-suspend persisted blocking in the 2nd start of CRC capture, which may indicate that something got stuck in the step of CRC setup. Indeed,wait_one_vblankin the crc setup was able to sync things and free allkms_cursor_crcsubtests.Besides, other alternatives to force enabling vblanks or prevent disabling them such as calling
drm_crtc_put_vblankormodeset_enablesbeforecommit_planes+ offdelay = 0, also unlock all subtests executions. These facts together converge on the lack of vblank to unblock the crc capture.Finally, considering the vkms's dependence on vblank interruptions to perform tasks, this patch acquires a vblank ref when setup CRC source and releases ref when disabling crc capture, ensuring vblanks happen to compute CRC.
Quoted 7 lines
Cc Rodrigo Siqueira <[email protected]>Cc Haneen Mohammed <[email protected]>Co-developed-by Sidong Yang <[email protected]>Signed-off-by Sidong Yang <[email protected]>Co-developed-by Daniel Vetter <[email protected]>Signed-off-by Daniel Vetter <[email protected]>Signed-off-by Melissa Wen <[email protected]>
Excellent summary of the debug story.
Quoted 9 lines
--- drivers/gpu/drm/vkms/vkms_composer.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/gpu/drm/vkms/vkms_composer.c +0
-0
drivers/gpu/drm/vkms/vkms_composer.c int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) · line 245
Quoted 5 lines
drivers/gpu/drm/vkms/vkms_composer.c +2
-0@@ -241,6 +241,14 @@ int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) ret =vkms_crc_parse_source (src_name, &enabled); +/* Ensure that vblank interruptions are enabled for crc capture */ +/* Enabling CRC: acquire vblank ref */
This comment just explains what the code does, that's not needed. The first comment I think can be replaced if we create a little helper function like
void vkms_set_composer(struct vkms_output, bool enable) {
bool old_state;
if (enabled)
drm_crtc_vblank_get(crtc);
spin_lock_irq(&out->lock);
old_enable = out->composer_enabled;
out->composer_enabled = enabled;
spin_unlock_irq(&out->lock);
if (old_enabled)
drm_crtc_vblank_put(crtc);}
This should also help as prep for the writeback work, where we have a 2nd user that might need to enable the composer (maybe even need to switch to refcounting the composer state then).
drivers/gpu/drm/vkms/vkms_composer.c int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) · line 250
Quoted 5 lines
drivers/gpu/drm/vkms/vkms_composer.c +5
-0+if (enabled) +drm_crtc_vblank_get (crtc); +/* Disabling CRC: release vblank ref */ +if (!src_name) +drm_crtc_vblank_put (crtc);
I'm not sure this correctly releases the vblank reference in all cases, I think the suggestion in the helper function pseudo code should work better. It does mean we temporarily elevate the vblank refcount if we go enabled -> enabled, but that's not a problem since it's refcounted.
Cheers, Daniel
Quoted 7 lines
drivers/gpu/drm/vkms/vkms_composer.c +1
-0+spin_lock_irq (&out->lock); out->composer_enabled = enabled;spin_unlock_irq (&out->lock);Signature · 1 line
2.27.0
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Melissa Wen
reviewerQuoted 83 lines · On 08/04, [email protected] wrote:
Quoted 39 lines · Melissa Wen
VKMS needs vblank interrupts enabled to capture CRC. When vblank is disabled, tests like
kms_cursor_crcandkms_pipe_crc_basicgetting stuck waiting for a capture that will not occur until vkms wakes up. This patch ensures that vblank remains enabled as long as the CRC capture is needed.It clears the execution of the following
kms_cursor_crcsubtests:
1. pipe-A-cursor-[size,alpha-opaque, NxN-(on-screen, off-screen, sliding, random, fast-moving])] - successful when running individually.
2. pipe-A-cursor-dpms passes again
3. pipe-A-cursor-suspend also passesThe issue was initially tracked in the sequential execution of IGT
kms_cursor_crcsubtest: when running the test sequence or one of its subtests twice, the odd execs complete and the pairs get stuck in an endless wait. In the IGT code, calling await_for_vblankon preparing for CRC capture prevented the busy-wait. But the problem persisted in the pipe-A-cursor-dpms and -suspend subtests.Checking the history, the pipe-A-cursor-dpms subtest was successful when, in
vkms_atomic_commit_tail, instead of using theflip_doneop, it usedwait_for_vblanks. Another way to prevent blocking waswait_one_vblankwhen enabling crtc. However, in both cases, pipe-A-cursor-suspend persisted blocking in the 2nd start of CRC capture, which may indicate that something got stuck in the step of CRC setup. Indeed,wait_one_vblankin the crc setup was able to sync things and free allkms_cursor_crcsubtests.Besides, other alternatives to force enabling vblanks or prevent disabling them such as calling
drm_crtc_put_vblankormodeset_enablesbeforecommit_planes+ offdelay = 0, also unlock all subtests executions. These facts together converge on the lack of vblank to unblock the crc capture.Finally, considering the vkms's dependence on vblank interruptions to perform tasks, this patch acquires a vblank ref when setup CRC source and releases ref when disabling crc capture, ensuring vblanks happen to compute CRC.
Quoted 7 lines
Cc Rodrigo Siqueira <[email protected]>Cc Haneen Mohammed <[email protected]>Co-developed-by Sidong Yang <[email protected]>Signed-off-by Sidong Yang <[email protected]>Co-developed-by Daniel Vetter <[email protected]>Signed-off-by Daniel Vetter <[email protected]>Signed-off-by Melissa Wen <[email protected]>Excellent summary of the debug story.
Quoted 9 lines
--- drivers/gpu/drm/vkms/vkms_composer.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/gpu/drm/vkms/vkms_composer.c +0
-0drivers/gpu/drm/vkms/vkms_composer.c int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) · line 245
Quoted 5 lines
drivers/gpu/drm/vkms/vkms_composer.c +2
-0@@ -241,6 +241,14 @@ int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) ret =vkms_crc_parse_source (src_name, &enabled); +/* Ensure that vblank interruptions are enabled for crc capture */ +/* Enabling CRC: acquire vblank ref */ This comment just explains what the code does, that's not needed. The first comment I think can be replaced if we create a little helper function like
void vkms_set_composer(struct vkms_output, bool enable) { bool old_state; if (enabled) drm_crtc_vblank_get(crtc); spin_lock_irq(&out->lock); old_enable = out->composer_enabled; out->composer_enabled = enabled; spin_unlock_irq(&out->lock); if (old_enabled) drm_crtc_vblank_put(crtc);
Quoted 6 lines
}
This should also help as prep for the writeback work, where we have a 2nd user that might need to enable the composer (maybe even need to switch to refcounting the composer state then).
Hi Daniel,
Thanks for the feedback and advice.
I applied the suggestion and just sent a v2.
Best regards,
Melissa
Quoted 13 lines
drivers/gpu/drm/vkms/vkms_composer.c int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) · line 250
Quoted 5 lines
drivers/gpu/drm/vkms/vkms_composer.c +5
-0+if (enabled) +drm_crtc_vblank_get (crtc); +/* Disabling CRC: release vblank ref */ +if (!src_name) +drm_crtc_vblank_put (crtc);I'm not sure this correctly releases the vblank reference in all cases, I think the suggestion in the helper function pseudo code should work better. It does mean we temporarily elevate the vblank refcount if we go enabled -> enabled, but that's not a problem since it's refcounted.
Cheers, Daniel
Quoted 12 lines
Quoted 7 lines
drivers/gpu/drm/vkms/vkms_composer.c +1
-0+spin_lock_irq (&out->lock); out->composer_enabled = enabled;spin_unlock_irq (&out->lock);Signature · 1 line
2.27.0Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel