drm: apple: get framebuffer iova in atomic_plane_update

Signed-off-by: James Calligeros <jcalligeros99@gmail.com>
Signed-off-by: Janne Grunau <j@jannau.net>

Author: chadmed

drivers/gpu/drm/apple/iomfb_template.c

@@ -20,7 +20,6 @@
 #include <drm/drm_fb_dma_helper.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_framebuffer.h>
-#include <drm/drm_gem_dma_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_vblank.h>
 
@@ -1306,8 +1305,6 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru
 
 	for_each_oldnew_plane_in_state(state, plane, old_state, new_state, plane_idx) {
 		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;
 
 		/* skip planes not for this crtc */
 		if (old_state->crtc != crtc && new_state->crtc != crtc)
@@ -1329,7 +1326,7 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru
 
 		req->swap.swap_enabled |= BIT(l);
 
-		if (old_state->fb && fb != old_state->fb) {
+		if (old_state->fb && new_state->fb != old_state->fb) {
 			/*
 			 * Race condition between a framebuffer unbind getting
 			 * swapped out and GEM unreferencing a framebuffer. If
@@ -1362,14 +1359,7 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru
 		if (dcp->notch_height > 0)
 			req->swap.dst_rect[l].y += dcp->notch_height;
 
-		/* the obvious helper call drm_fb_dma_get_gem_addr() adjusts
-		 * the address for source x/y offsets. Since IOMFB has a direct
-		 * support source position prefer that.
-		 */
-		obj = drm_fb_dma_get_gem_obj(fb, 0);
-		if (obj)
-			req->surf_iova[l] = obj->dma_addr + fb->offsets[0];
-
+		req->surf_iova[l] = apple_state->iova;
 		req->surf[l].base = apple_state->surf;
 
 	}

drivers/gpu/drm/apple/plane.c

@@ -12,6 +12,7 @@
 #include <drm/drm_fourcc.h>
 #include <drm/drm_fb_dma_helper.h>
 #include <drm/drm_framebuffer.h>
+#include <drm/drm_gem_dma_helper.h>
 #include <drm/drm_plane.h>
 
 #define FRAC_16_16(mult, div)    (((mult) << 16) / (div))
@@ -128,6 +129,7 @@ static void apple_plane_atomic_update(struct drm_plane *plane,
 {
 	struct drm_plane_state *base = drm_atomic_get_new_plane_state(state, plane);
 	struct apple_plane_state *new_state;
+	struct drm_gem_dma_object *obj;
 	bool is_premultiplied = false;
 
 	if (!base)
@@ -171,6 +173,14 @@ static void apple_plane_atomic_update(struct drm_plane *plane,
 		.has_comp = 1,
 		.has_planes = 1,
 	};
+
+	/* the obvious helper call drm_fb_dma_get_gem_addr() adjusts
+	 * the address for source x/y offsets. Since IOMFB has a direct
+	 * support source position prefer that.
+	 */
+	obj = drm_fb_dma_get_gem_obj(base->fb, 0);
+	if (obj)
+		new_state->iova = obj->dma_addr + base->fb->offsets[0];
 }
 
 static const struct drm_plane_helper_funcs apple_primary_plane_helper_funcs = {

drivers/gpu/drm/apple/plane.h

@@ -17,6 +17,7 @@ struct apple_plane_state {
 	struct dcp_surface surf;
 	struct dcp_rect src_rect;
 	struct dcp_rect dst_rect;
+	u64 iova;
 };
 
 #define to_apple_plane_state(x) container_of(x, struct apple_plane_state, base)