From 5b74986eb52e674ad69d1b227dbea8375804fffc Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.com>
Date: Mon, 5 Aug 2024 16:50:43 +0100
Subject: [PATCH] Revert "drm/vc4: tests: Add helper to add a new plane to a
 state"

This reverts commit 379066bd69635a54ed5a1e8cb85fb4745923aa4c.
---
 drivers/gpu/drm/vc4/tests/vc4_mock.h       |  3 ---
 drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 22 ----------------------
 2 files changed, 25 deletions(-)

diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock.h b/drivers/gpu/drm/vc4/tests/vc4_mock.h
index 1d84dd1adedf8d..1e87e3a0ed7e14 100644
--- a/drivers/gpu/drm/vc4/tests/vc4_mock.h
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h
@@ -39,9 +39,6 @@ struct vc4_dummy_plane {
 	struct vc4_plane plane;
 };
 
-struct vc4_dummy_plane *vc4_dummy_plane(struct kunit *test,
-					struct drm_device *drm,
-					enum drm_plane_type type);
 struct drm_plane *vc4_dummy_plane(struct kunit *test, struct drm_device *drm,
 				  enum drm_plane_type type);
 
diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
index e0babdc583026d..43725ddb5e4fba 100644
--- a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 
 #include <drm/drm_kunit_helpers.h>
-#include <drm/drm_atomic_uapi.h>
 #include <drm/drm_plane.h>
 
 #include <kunit/test.h>
@@ -41,24 +40,3 @@ struct drm_plane *vc4_dummy_plane(struct kunit *test, struct drm_device *drm,
 
 	return plane;
 }
-
-struct drm_plane *
-vc4_mock_atomic_add_plane(struct kunit *test,
-			  struct drm_atomic_state *state,
-			  struct drm_crtc *crtc)
-{
-	struct drm_plane_state *plane_state;
-	struct drm_plane *plane;
-	int ret;
-
-	plane = vc4_mock_find_plane_for_crtc(test, crtc);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane);
-
-	plane_state = drm_atomic_get_plane_state(state, plane);
-	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_state);
-
-	ret = drm_atomic_set_crtc_for_plane(plane_state, crtc);
-	KUNIT_EXPECT_EQ(test, ret, 0);
-
-	return plane;
-}