diff options
| author | Maxime Ripard <mripard@kernel.org> | 2026-09-15 12:12:51 +0200 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2026-09-15 16:13:04 +0200 |
| commit | 87882cd6debd94a14c65894e9220be8a01b5d4fa (patch) | |
| tree | 33e56750c7863355c75a2866a5bb1613b34eb032 | |
| parent | 3a4affc50a208be6ab9c5567cd816cccf55888c7 (diff) | |
| download | linux-next-87882cd6debd94a14c65894e9220be8a01b5d4fa.tar.gz linux-next-87882cd6debd94a14c65894e9220be8a01b5d4fa.zip | |
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 <javierm@redhat.com>
Link: https://patch.msgid.link/20260915101251.1711103-1-mripard@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |