diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 2d34f9bb5d47fc28d92c6207758cacb1b70325c7..2bb2fc2a6566a2473baf7e7c30b49626b95ec067 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -442,14 +442,6 @@ struct amdgpu_crtc {
 	struct drm_pending_vblank_event *event;
 };
 
-/* TODO rename to dc_plane_state */
-struct  dc_surface;
-
-struct dm_plane_state {
-	struct drm_plane_state base;
-	struct  dc_surface* dc_surface;
-};
-
 struct amdgpu_plane {
 	struct drm_plane base;
 	enum drm_plane_type plane_type;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h
index b69c86826b1ad554002d4d4a77c7914cbfd6bb77..6411dd1819ddb0b7c6dd5e6f651ecdf68a05c01a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h
@@ -33,6 +33,12 @@ struct amdgpu_display_manager;
 struct dc_validation_set;
 struct dc_surface;
 
+struct dm_plane_state {
+	struct drm_plane_state base;
+	struct dc_surface *dc_surface;
+};
+
+
 /*TODO Jodan Hersen use the one in amdgpu_dm*/
 int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
 			struct amdgpu_plane *aplane,