From 87882cd6debd94a14c65894e9220be8a01b5d4fa Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 15 Sep 2026 12:12:51 +0200 Subject: drm/amdgpu_dm: tests: Fix wrong variable declaration after merge conflict Commit 2bcec01cf105 ("drm/amdgpu_dm: Convert to atomic_create_state") converted dm_test_plane_create_state_initializes_state() to call amdgpu_dm_plane_drm_plane_create_state(), which returns a struct drm_plane_state pointer stored in a new plane_state variable. However, the merge conflict resolution kept the old declaration (struct dm_plane_state *old_state) instead of replacing it with struct drm_plane_state *plane_state, leaving an unused variable with the wrong type. Fix the declaration to match what the conversion intended. Fixes: 2bcec01cf105 ("drm/amdgpu_dm: Convert to atomic_create_state") Reviewed-by: Javier Martinez Canillas Link: https://patch.msgid.link/20260915101251.1711103-1-mripard@kernel.org Signed-off-by: Maxime Ripard --- drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c index c75a2ef87479..4a2ea3ea2ce5 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c @@ -2933,7 +2933,7 @@ static const struct drm_plane_funcs dm_test_plane_reset_funcs = { */ static void dm_test_plane_create_state_initializes_state(struct kunit *test) { - struct dm_plane_state *old_state; + struct drm_plane_state *plane_state; struct dm_plane_state *new_state; struct drm_plane *plane; -- cgit v1.2.3