drm: apple: move dcp rectangle creation to atomic_plane_update

We should not be programming rectangles in atomic_flush. Move this step
to atomic_plane_update and store the resultant rectangles with the
rest of the surface's state.

Signed-off-by: James Calligeros <[email protected]>
Signed-off-by: Janne Grunau <[email protected]>

Author: chadmed

drivers/gpu/drm/apple/iomfb.c

@@ -343,19 +343,6 @@ static void dcpep_got_msg(struct apple_dcp *dcp, u64 message)
 		dcpep_handle_cb(dcp, ctx_id, data, length, offset);
 }
 
-/*
- * DRM specifies rectangles as start and end coordinates.  DCP specifies
- * rectangles as a start coordinate and a width/height. Convert a DRM rectangle
- * to a DCP rectangle.
- */
-struct dcp_rect drm_to_dcp_rect(struct drm_rect *rect)
-{
-	return (struct dcp_rect){ .x = rect->x1,
-				  .y = rect->y1,
-				  .w = drm_rect_width(rect),
-				  .h = drm_rect_height(rect) };
-}
-
 int dcp_get_modes(struct drm_connector *connector)
 {
 	struct apple_connector *apple_connector = to_apple_connector(connector);

drivers/gpu/drm/apple/iomfb.h

@@ -100,13 +100,6 @@ struct dcp_iouserclient {
 	u8 padding[2];
 } __packed;
 
-struct dcp_rect {
-	u32 x;
-	u32 y;
-	u32 w;
-	u32 h;
-} __packed;
-
 /*
  * Update background color to struct dcp_swap.bg_color
  */

drivers/gpu/drm/apple/iomfb_internal.h

@@ -109,13 +109,6 @@ int dcp_parse_tag(char tag[4]);
 
 void dcp_ack(struct apple_dcp *dcp, enum dcp_context_id context);
 
-/*
- * DRM specifies rectangles as start and end coordinates.  DCP specifies
- * rectangles as a start coordinate and a width/height. Convert a DRM rectangle
- * to a DCP rectangle.
- */
-struct dcp_rect drm_to_dcp_rect(struct drm_rect *rect);
-
 /* The user may own drm_display_mode, so we need to search for our copy */
 struct dcp_display_mode *lookup_mode(struct apple_dcp *dcp,
 					    const struct drm_display_mode *mode);

drivers/gpu/drm/apple/iomfb_plane.h

@@ -11,6 +11,13 @@
 
 #define DCP_SURF_MAX_PLANES 3
 
+struct dcp_rect {
+	u32 x;
+	u32 y;
+	u32 w;
+	u32 h;
+} __packed;
+
 /* Information describing a plane of a planar compressed surface */
 struct dcp_plane_info {
 	u32 width;

drivers/gpu/drm/apple/iomfb_template.c

@@ -1308,7 +1308,6 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru
 		struct apple_plane_state *apple_state = to_apple_plane_state(new_state);
 		struct drm_framebuffer *fb = new_state->fb;
 		struct drm_gem_dma_object *obj;
-		struct drm_rect src_rect;
 
 		/* skip planes not for this crtc */
 		if (old_state->crtc != crtc && new_state->crtc != crtc)
@@ -1357,10 +1356,8 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru
 		req->surf_null[l] = false;
 		has_surface = 1;
 
-		drm_rect_fp_to_int(&src_rect, &new_state->src);
-
-		req->swap.src_rect[l] = drm_to_dcp_rect(&src_rect);
-		req->swap.dst_rect[l] = drm_to_dcp_rect(&new_state->dst);
+		req->swap.src_rect[l] = apple_state->src_rect;
+		req->swap.dst_rect[l] = apple_state->dst_rect;
 
 		if (dcp->notch_height > 0)
 			req->swap.dst_rect[l].y += dcp->notch_height;

drivers/gpu/drm/apple/iomfb_template.h

@@ -13,6 +13,7 @@
 #include <linux/types.h>
 
 #include "iomfb.h"
+#include "iomfb_plane.h"
 #include "plane.h"
 #include "version_utils.h"
 

drivers/gpu/drm/apple/plane.c

@@ -83,6 +83,27 @@ static int apple_plane_atomic_check(struct drm_plane *plane,
 	return 0;
 }
 
+/*
+ * DRM specifies rectangles as start and end coordinates.  DCP specifies
+ * rectangles as a start coordinate and a width/height. Convert a DRM rectangle
+ * to a DCP rectangle.
+ */
+static struct dcp_rect drm_to_dcp_rect(const struct drm_rect *rect)
+{
+	return (struct dcp_rect){ .x = rect->x1,
+				  .y = rect->y1,
+				  .w = drm_rect_width(rect),
+				  .h = drm_rect_height(rect),
+	};
+}
+
+static struct dcp_rect drm_to_dcp_rect_fp(const struct drm_rect *fp_rect)
+{
+	struct drm_rect rect;
+	drm_rect_fp_to_int(&rect, fp_rect);
+	return drm_to_dcp_rect(&rect);
+}
+
 static u32 drm_format_to_dcp(u32 drm)
 {
 	switch (drm) {
@@ -129,6 +150,9 @@ static void apple_plane_atomic_update(struct drm_plane *plane,
 	    fb->format->format == DRM_FORMAT_XBGR8888)
 		is_premultiplied = true;
 
+	new_state->src_rect = drm_to_dcp_rect_fp(&base->src);
+	new_state->dst_rect = drm_to_dcp_rect(&base->dst);
+
 	new_state->surf = (struct dcp_surface){
 		.is_premultiplied = is_premultiplied,
 		.format = drm_format_to_dcp(fb->format->format),

drivers/gpu/drm/apple/plane.h

@@ -15,6 +15,8 @@
 struct apple_plane_state {
 	struct drm_plane_state base;
 	struct dcp_surface surf;
+	struct dcp_rect src_rect;
+	struct dcp_rect dst_rect;
 };
 
 #define to_apple_plane_state(x) container_of(x, struct apple_plane_state, base)