[PATCH] drm/amdgpu_dm: tests: Fix wrong variable declaration after merge conflict

[PATCH] drm/amdgpu_dm: tests: Fix wrong variable declaration after merge conflict

[Maxime Ripard]

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")
Signed-off-by: Maxime Ripard <mripard@kernel.org>

---

Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Leo Li <sunpeng.li@amd.com>
Cc: Rodrigo Siqueira <siqueira@igalia.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: amd-gfx@lists.freedesktop.org
---
 .../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
@@ -2931,11 +2931,11 @@ static const struct drm_plane_funcs dm_test_plane_reset_funcs = {
  * dm_plane_state, and initializes the AMD-specific transfer function and HDR
  * multiplier defaults.
  */
 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;
 
 	plane = kunit_kzalloc(test, sizeof(*plane), GFP_KERNEL);
 	KUNIT_ASSERT_NOT_NULL(test, plane);
-- 
2.55.0

Re: [PATCH] drm/amdgpu_dm: tests: Fix wrong variable declaration after merge conflict

[Javier Martinez Canillas]

On Tue, Sep 15, 2026 at 12:12 PM Maxime Ripard <mripard@kernel.org> wrote:
>
> 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")
> Signed-off-by: Maxime Ripard <mripard@kernel.org>
>

Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>

Re: [PATCH] drm/amdgpu_dm: tests: Fix wrong variable declaration after merge conflict

[Maxime Ripard]

On Tue, 15 Sep 2026 12:12:51 +0200, Maxime Ripard wrote:
> 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.
> 
> [...]

Applied to misc/kernel.git (drm-misc-next)

[1/1] drm/amdgpu_dm: tests: Fix wrong variable declaration after merge conflict
      commit: 87882cd6debd94a14c65894e9220be8a01b5d4fa

Thanks!
Maxime