From: Ivan Lipski <[email protected]> [Why&How] DMUB uses LSDMA for alt-ch aperture copies.
In dm_dmub_hw_init(), query DMUB feature caps first, then set lsdma_rb_fb from DMUB_WINDOW_LSDMA_BUFFER and call dmub_lsdma_init(). Cc: Alvin Lee <[email protected]> Signed-off-by: Ivan Lipski <[email protected]> Signed-off-by: Wayne Lin <[email protected]> --- .../amd/display/amdgpu_dm/amdgpu_dm_dmub.c | 6 ++++ .../amdgpu_dm/tests/amdgpu_dm_dmub_test.c | 31 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c index 0ea8f9a582cc..d655ae8bbb52 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c @@ -382,11 +382,17 @@ int dm_dmub_hw_init(struct amdgpu_device *adev) return -ENOMEM; } + /* Load DMUB caps */ + dc_dmub_srv_query_caps_cmd(adev->dm.dc->ctx->dmub_srv); + /* Cursor offload has to be enabled; prime it on every DMUB init, * including post-suspend and GPU-reset. */ dc_dmub_srv_cursor_offload_init(adev->dm.dc); + dmub_srv->lsdma_rb_fb = fb_info->fb[DMUB_WINDOW_LSDMA_BUFFER]; + dmub_lsdma_init(adev->dm.dc->ctx->dmub_srv); + drm_info(adev_to_drm(adev), "DMUB hardware initialized: version=0x%08X\n", adev->dm.dmcub_fw_version); diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_dmub_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_dmub_test.c index 2e273dea17ef..b48c96ec4250 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_dmub_test.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_dmub_test.c @@ -70,6 +70,16 @@ static void dm_test_dmub_init_reg_offsets(struct dmub_srv *dmub, { } +static void dm_test_dmub_set_inbox1_wptr(struct dmub_srv *dmub, uint32_t wptr_offset) +{ +} + +/* The fake firmware consumes inbox1 commands instantly: rptr tracks wptr. */ +static uint32_t dm_test_dmub_get_inbox1_ptr(struct dmub_srv *dmub) +{ + return dmub->inbox1.rb.wrpt; +} + static bool dm_test_dmcu_init(struct dmcu *dmcu) { return true; @@ -99,6 +109,9 @@ static struct dmub_srv *dm_test_alloc_dmub_srv(struct kunit *test) dmub_srv->hw_funcs.is_hw_init = dm_test_dmub_hw_initialized; dmub_srv->hw_funcs.get_fw_status = dm_test_dmub_fw_ready; dmub_srv->hw_funcs.init_reg_offsets = dm_test_dmub_init_reg_offsets; + dmub_srv->hw_funcs.set_inbox1_wptr = dm_test_dmub_set_inbox1_wptr; + dmub_srv->hw_funcs.get_inbox1_rptr = dm_test_dmub_get_inbox1_ptr; + dmub_srv->hw_funcs.get_inbox1_wptr = dm_test_dmub_get_inbox1_ptr; return dmub_srv; } @@ -650,6 +663,23 @@ static void dm_test_dmub_hw_init_success_fake_dmub(struct kunit *test) KUNIT_EXPECT_NOT_NULL(test, adev->dm.dc->ctx->dmub_srv); } +/** + * dm_test_dmub_hw_init_lsdma_buffer - Test hw init assigns the LSDMA ring buffer + * @test: The KUnit test context + * + * dm_dmub_hw_init() should point the DMUB LSDMA ring buffer at the + * DMUB_WINDOW_LSDMA_BUFFER framebuffer window. + */ +static void dm_test_dmub_hw_init_lsdma_buffer(struct kunit *test) +{ + struct amdgpu_device *adev = dm_test_alloc_adev_with_dmub(test); + struct dmub_fb *lsdma_fb = &adev->dm.dmub_fb_info->fb[DMUB_WINDOW_LSDMA_BUFFER]; + + KUNIT_EXPECT_EQ(test, dm_dmub_hw_init(adev), 0); + KUNIT_EXPECT_PTR_EQ(test, adev->dm.dmub_srv->lsdma_rb_fb.cpu_addr, lsdma_fb->cpu_addr); + KUNIT_EXPECT_EQ(test, adev->dm.dmub_srv->lsdma_rb_fb.size, lsdma_fb->size); +} + /** * dm_test_dmub_hw_init_no_hw_support - Test hw init returns 0 when HW is unsupported * @test: The KUnit test context @@ -1917,6 +1947,7 @@ static struct kunit_case amdgpu_dm_dmub_tests[] = { KUNIT_CASE(dm_test_dmub_hw_init_no_fb_info), KUNIT_CASE(dm_test_dmub_hw_init_no_firmware), KUNIT_CASE(dm_test_dmub_hw_init_success_fake_dmub), + KUNIT_CASE(dm_test_dmub_hw_init_lsdma_buffer), KUNIT_CASE(dm_test_dmub_hw_init_no_hw_support), KUNIT_CASE(dm_test_dmub_hw_init_bss_data), KUNIT_CASE(dm_test_dmub_hw_init_hw_init_fails), -- 2.43.0
