From: James Lin <[email protected]> [Why & How] The adapter never read update_type; DC derives the update type itself inside dc_update_planes_and_stream(). Drop the dead parameter from the prototype, the two callers and the KUnit tests.
Reviewed-by: Leo Li <[email protected]> Signed-off-by: James Lin <[email protected]> Signed-off-by: Chenyu Chen <[email protected]> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ---- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 - drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_test.c | 4 ++-- 3 files changed, 2 insertions(+), 7 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 301e09e60e75..9a585f8b3d67 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -275,7 +275,6 @@ static const struct amdgpu_dm_kunit_ops *amdgpu_dm_ops; * before passing control to DC. * * @dc: Display Core control structure - * @update_type: specify whether it is FULL/MEDIUM/FAST update * @planes_count: planes count to update * @stream: stream state * @stream_update: stream update @@ -284,7 +283,6 @@ static const struct amdgpu_dm_kunit_ops *amdgpu_dm_ops; */ STATIC_IFN_KUNIT INLINE_IFN_KUNIT bool update_planes_and_stream_adapter(struct dc *dc, - int update_type, int planes_count, struct dc_stream_state *stream, struct dc_stream_update *stream_update, @@ -1807,7 +1805,6 @@ STATIC_IFN_KUNIT void dm_gpureset_commit_state(struct dc_state *dc_state, } update_planes_and_stream_adapter(dm->dc, - UPDATE_TYPE_FULL, dc_state->stream_status[k].plane_count, dc_state->streams[k], &bundle->stream_update, @@ -4229,7 +4226,6 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_commit *state, } mutex_lock(&dm->dc_lock); update_planes_and_stream_adapter(dm->dc, - acrtc_state->update_type, planes_count, acrtc_state->stream, stream_update_needed ? &bundle->stream_update : NULL, diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h index d2b1a63c99a5..7b8941b44895 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h @@ -1251,7 +1251,6 @@ void s3_handle_mst(struct drm_device *dev, bool suspend); void dm_gpureset_commit_state(struct dc_state *dc_state, struct amdgpu_display_manager *dm); int dm_plane_layer_index_cmp(const void *a, const void *b); bool update_planes_and_stream_adapter(struct dc *dc, - int update_type, int planes_count, struct dc_stream_state *stream, struct dc_stream_update *stream_update, 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 6335fc23e977..e0fbb84912df 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 @@ -413,7 +413,7 @@ static void dm_test_update_planes_adapter_sorts_and_forwards(struct kunit *test) }; dm_test_install_dm_ops(test, &dm_test_plane_update_ops); - KUNIT_EXPECT_TRUE(test, update_planes_and_stream_adapter(dc, UPDATE_TYPE_FAST, 3, + KUNIT_EXPECT_TRUE(test, update_planes_and_stream_adapter(dc, 3, stream, stream_update, updates)); KUNIT_EXPECT_EQ(test, updates[0].surface->layer_index, 5); KUNIT_EXPECT_EQ(test, updates[1].surface->layer_index, 3); @@ -436,7 +436,7 @@ static void dm_test_update_planes_adapter_propagates_failure(struct kunit *test) dm_test_plane_update_ctx = (struct dm_test_plane_update_ops_ctx) { 0 }; dm_test_install_dm_ops(test, &dm_test_plane_update_ops); - KUNIT_EXPECT_FALSE(test, update_planes_and_stream_adapter(NULL, UPDATE_TYPE_FAST, 0, + KUNIT_EXPECT_FALSE(test, update_planes_and_stream_adapter(NULL, 0, NULL, NULL, NULL)); } -- 2.43.0
