The soft_reset() function for the DCE / DCN blocks has never been implemented, and there are no plans to implement it.
Let's delete this function, it doesn't do anything and also isn't called from anywhere. Signed-off-by: Timur Kristóf <[email protected]> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 -------- .../drm/amd/display/amdgpu_dm/tests/amdgpu_dm_test.c | 10 ---------- 2 files changed, 18 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index f49cc198fb0d..4cf81b8dc030 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -231,13 +231,6 @@ STATIC_IFN_KUNIT int dm_wait_for_idle(struct amdgpu_ip_block *ip_block) } EXPORT_IF_KUNIT(dm_wait_for_idle); -STATIC_IFN_KUNIT int dm_soft_reset(struct amdgpu_ip_block *ip_block) -{ - /* XXX todo */ - return 0; -} -EXPORT_IF_KUNIT(dm_soft_reset); - /* * DC will program planes with their z-order determined by their ordering * in the dc_surface_updates array. This comparator is used to sort them @@ -2109,7 +2102,6 @@ static const struct amd_ip_funcs amdgpu_dm_funcs = { .suspend = dm_suspend, .resume = dm_resume, .wait_for_idle = dm_wait_for_idle, - .soft_reset = dm_soft_reset, .set_clockgating_state = dm_set_clockgating_state, .set_powergating_state = dm_set_powergating_state, }; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_test.c index a67774e6db36..a3ccb2522a6a 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_test.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_test.c @@ -49,15 +49,6 @@ static void dm_test_wait_for_idle(struct kunit *test) KUNIT_EXPECT_EQ(test, dm_wait_for_idle(NULL), 0); } -/** - * dm_test_soft_reset - Test placeholder soft-reset callback returns success - * @test: The KUnit test context - */ -static void dm_test_soft_reset(struct kunit *test) -{ - KUNIT_EXPECT_EQ(test, dm_soft_reset(NULL), 0); -} - /** * dm_test_set_clockgating_state - Test placeholder clockgating callback returns success * @test: The KUnit test context @@ -4541,7 +4532,6 @@ static void dm_test_initialize_plane_overlay(struct kunit *test) static struct kunit_case amdgpu_dm_tests[] = { /* Simple DM callbacks */ KUNIT_CASE(dm_test_wait_for_idle), - KUNIT_CASE(dm_test_soft_reset), KUNIT_CASE(dm_test_set_clockgating_state), KUNIT_CASE(dm_test_set_powergating_state), KUNIT_CASE(dm_test_bandwidth_update), -- 2.55.0
