media: apple: isp: Rework meta surface handling & buffer return

Now we keep track of meta surfaces independently, and always allocate 16
of them, plus handle buffer return messages more correctly.

Fixes t8112 asserts (for some reason).

Signed-off-by: Asahi Lina <lina@asahilina.net>

Author: hoshinolina

drivers/media/platform/apple/isp/isp-drv.h

@@ -43,6 +43,7 @@ struct isp_surf {
 	void *virt;
 	refcount_t refcount;
 	bool gc;
+	bool submitted;
 };
 
 struct isp_message {
@@ -221,6 +222,7 @@ struct apple_isp {
 	struct isp_surf *data_surf;
 	struct isp_surf *log_surf;
 	struct isp_surf *bt_surf;
+	struct isp_surf *meta_surfs[ISP_MAX_BUFFERS];
 	struct list_head gc;
 	struct workqueue_struct *wq;
 
@@ -252,7 +254,6 @@ struct isp_buffer {
 	struct vb2_v4l2_buffer vb;
 	struct list_head link;
 	struct isp_surf surfs[VB2_MAX_PLANES];
-	struct isp_surf *meta;
 };
 
 #define to_isp_buffer(x) container_of((x), struct isp_buffer, vb)

drivers/media/platform/apple/isp/isp-fw.c

@@ -12,6 +12,7 @@
 #include "isp-iommu.h"
 #include "isp-ipc.h"
 #include "isp-regs.h"
+#include "isp-v4l2.h"
 
 #define ISP_FIRMWARE_MDELAY    1
 #define ISP_FIRMWARE_MAX_TRIES 1000

drivers/media/platform/apple/isp/isp-ipc.c

@@ -284,45 +284,3 @@ int ipc_sm_handle(struct apple_isp *isp, struct isp_channel *chan)
 
 	return 0;
 }
-
-int ipc_bt_handle(struct apple_isp *isp, struct isp_channel *chan)
-{
-	struct isp_message *req = &chan->req, *rsp = &chan->rsp;
-	struct isp_buffer *tmp, *buf;
-	int err = 0;
-
-	/* No need to read the whole struct */
-	u64 meta_iova;
-	u64 *p_meta_iova = apple_isp_translate(
-		isp, isp->bt_surf, req->arg0 + ISP_IPC_BUFEXC_STAT_META_OFFSET,
-		sizeof(u64));
-
-	if (!p_meta_iova) {
-		dev_err(isp->dev, "Failed to find bufexc stat meta\n");
-		return -EIO;
-	}
-	meta_iova = *p_meta_iova;
-
-	spin_lock(&isp->buf_lock);
-	list_for_each_entry_safe_reverse(buf, tmp, &isp->bufs_submitted, link) {
-		if ((u32)buf->meta->iova == (u32)meta_iova) {
-			enum vb2_buffer_state state = VB2_BUF_STATE_ERROR;
-
-			buf->vb.vb2_buf.timestamp = ktime_get_ns();
-			buf->vb.sequence = isp->sequence++;
-			buf->vb.field = V4L2_FIELD_NONE;
-			if (req->arg2 == ISP_IPC_BUFEXC_FLAG_RENDER)
-				state = VB2_BUF_STATE_DONE;
-			vb2_buffer_done(&buf->vb.vb2_buf, state);
-			list_del(&buf->link);
-			break;
-		}
-	}
-	spin_unlock(&isp->buf_lock);
-
-	rsp->arg0 = req->arg0 | ISP_IPC_FLAG_ACK;
-	rsp->arg1 = 0x0;
-	rsp->arg2 = ISP_IPC_BUFEXC_FLAG_ACK;
-
-	return err;
-}

drivers/media/platform/apple/isp/isp-ipc.h

@@ -21,6 +21,5 @@ int ipc_chan_send(struct apple_isp *isp, struct isp_channel *chan,
 
 int ipc_tm_handle(struct apple_isp *isp, struct isp_channel *chan);
 int ipc_sm_handle(struct apple_isp *isp, struct isp_channel *chan);
-int ipc_bt_handle(struct apple_isp *isp, struct isp_channel *chan);
 
 #endif /* __ISP_IPC_H__ */