fixup! drm: apple: Move plane bits out of apple_drv/iomfb_flush

Author: jannau

drivers/gpu/drm/apple/plane.c

@@ -303,11 +303,28 @@ static const struct drm_plane_helper_funcs apple_plane_helper_funcs = {
 	.atomic_update	= apple_plane_atomic_update,
 };
 
+// Duplicate drm_atomic_helper_plane_reset but allocate struct apple_plane_state
+static void apple_plane_reset(struct drm_plane *plane)
+{
+        struct apple_plane_state *state = to_apple_plane_state(plane->state);
+	if (state)
+		__drm_atomic_helper_plane_destroy_state(&state->base);
+
+	kfree(state);
+	plane->state = NULL;
+	state = kzalloc(sizeof(*state), GFP_KERNEL);
+	if (state)
+		__drm_atomic_helper_plane_reset(plane, &state->base);
+}
+
 static struct drm_plane_state *
 apple_plane_duplicate_state(struct drm_plane *plane)
 {
         struct apple_plane_state *apple_plane_state, *old_apple_plane_state;
 
+	if (!plane->state)
+		return NULL;
+
         old_apple_plane_state = to_apple_plane_state(plane->state);
         apple_plane_state = kzalloc(sizeof(*apple_plane_state), GFP_KERNEL);
         if (!apple_plane_state)
@@ -329,7 +346,7 @@ apple_plane_duplicate_state(struct drm_plane *plane)
 static const struct drm_plane_funcs apple_plane_funcs = {
 	.update_plane		= drm_atomic_helper_update_plane,
 	.disable_plane		= drm_atomic_helper_disable_plane,
-	.reset			= drm_atomic_helper_plane_reset,
+	.reset			= apple_plane_reset,
 	.atomic_duplicate_state = apple_plane_duplicate_state,
 	// .atomic_destroy_state	= apple_plane_destroy_state,
 	.atomic_destroy_state	= drm_atomic_helper_plane_destroy_state,