From: Bhawanpreet Lakha <[email protected]> Add dm_test_crtc_handle_vblank_completes_cursor_only to cover the previously untested branch in amdgpu_dm_crtc_handle_vblank() where a pending event with pflip_status != AMDGPU_FLIP_SUBMITTED (a cursor-only commit) is signalled: the vblank event is sent, the vblank reference is dropped, and acrtc->event is cleared.
Assisted-by: Copilot:Claude-Opus-4.8 Reviewed-by: Alex Hung <[email protected]> Signed-off-by: Bhawanpreet Lakha <[email protected]> Signed-off-by: Roman Li <[email protected]> --- .../amdgpu_dm/tests/amdgpu_dm_crtc_test.c | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c index 9948d1780454..6bc4f932c839 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c @@ -971,6 +971,50 @@ static void dm_test_crtc_handle_vblank_skips_when_flip_submitted(struct kunit *t KUNIT_EXPECT_PTR_EQ(test, acrtc->event, event); } +/** + * dm_test_crtc_handle_vblank_completes_cursor_only - Test event sent on vblank + * @test: The KUnit test context + * + * A pending event whose flip is not AMDGPU_FLIP_SUBMITTED (a cursor-only commit) + * must be signalled on vblank: the vblank event is sent, the vblank reference is + * dropped and acrtc->event is cleared. + */ +static void dm_test_crtc_handle_vblank_completes_cursor_only(struct kunit *test) +{ + struct drm_pending_vblank_event *event; + struct amdgpu_device *adev; + struct amdgpu_crtc *acrtc; + + adev = dm_kunit_alloc_adev(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, adev); + + KUNIT_ASSERT_EQ(test, drm_vblank_init(&adev->ddev, 1), 0); + + acrtc = kunit_kzalloc(test, sizeof(*acrtc), GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, acrtc); + + /* drm_crtc_send_vblank_event() consumes (kfree()s) the event. */ + event = kzalloc_obj(*event, GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, event); + + acrtc->base.dev = &adev->ddev; + acrtc->event = event; + acrtc->pflip_status = AMDGPU_FLIP_NONE; + + /* + * Take a vblank reference so the handler's drm_crtc_vblank_put() does not + * underflow. Mark vblank enabled so the get succeeds without a hardware + * enable hook. + */ + adev->ddev.vblank[0].enabled = true; + KUNIT_ASSERT_EQ(test, drm_crtc_vblank_get(&acrtc->base), 0); + + amdgpu_dm_crtc_handle_vblank(acrtc); + + /* Cursor-only commit: event was signalled and cleared. */ + KUNIT_EXPECT_NULL(test, acrtc->event); +} + /** * dm_test_vblank_control_worker_setup - Build a vblank_control_work for the worker * @test: The KUnit test context @@ -1168,6 +1212,7 @@ static struct kunit_case amdgpu_dm_crtc_tests[] = { /* amdgpu_dm_crtc_handle_vblank */ KUNIT_CASE(dm_test_crtc_handle_vblank_no_event), KUNIT_CASE(dm_test_crtc_handle_vblank_skips_when_flip_submitted), + KUNIT_CASE(dm_test_crtc_handle_vblank_completes_cursor_only), /* amdgpu_dm_crtc_vblank_control_worker */ KUNIT_CASE(dm_test_vblank_control_worker_enable_increments), KUNIT_CASE(dm_test_vblank_control_worker_disable_decrements), -- 2.34.1
