From c0f0809b423688644091b31278e45d5373bd2108 Mon Sep 17 00:00:00 2001
From: Asahi Lina <lina@asahilina.net>
Date: Wed, 4 Oct 2023 22:26:47 +0900
Subject: [PATCH] media: apple: isp: VMap only what is necessary, remove
 redundant logging state bit

Signed-off-by: Asahi Lina <lina@asahilina.net>
---
 drivers/media/platform/apple/isp/isp-ipc.c | 41 ++++++++--------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/drivers/media/platform/apple/isp/isp-ipc.c b/drivers/media/platform/apple/isp/isp-ipc.c
index 9d965ef7756b9b..54a88ed876c2b7 100644
--- a/drivers/media/platform/apple/isp/isp-ipc.c
+++ b/drivers/media/platform/apple/isp/isp-ipc.c
@@ -204,7 +204,7 @@ int ipc_tm_handle(struct apple_isp *isp, struct isp_channel *chan)
 	dma_addr_t iova = req->arg0 & ~ISP_IPC_FLAG_TERMINAL_ACK;
 	u32 size = req->arg1;
 	if (iova && size && size < sizeof(buf) &&
-	    test_bit(ISP_STATE_LOGGING, &isp->state)) {
+	    isp->log_surf) {
 		void *p = apple_isp_translate(isp, isp->log_surf, iova, size);
 		if (p) {
 			size = min_t(u32, size, 512);
@@ -243,42 +243,31 @@ int ipc_sm_handle(struct apple_isp *isp, struct isp_channel *chan)
 		rsp->arg1 = 0x0;
 		rsp->arg2 = 0x0; /* macOS uses this to index surfaces */
 
+		switch (surf->type) {
+		case 0x4c4f47: /* "LOG" */
+			isp->log_surf = surf;
+			break;
+		case 0x4d495343: /* "MISC" */
+			/* Hacky... maybe there's a better way to identify this surface? */
+			if (surf->size == 0xc000)
+				isp->bt_surf = surf;
+			break;
+		default:
+			// skip vmap
+			return 0;
+		}
+
 		err = isp_surf_vmap(isp, surf);
 		if (err < 0) {
 			isp_err(isp, "failed to vmap iova=0x%llx size=0x%llx\n",
 				surf->iova, surf->size);
-		} else {
-			switch (surf->type) {
-			case 0x4c4f47: /* "LOG" */
-				isp->log_surf = surf;
-				break;
-			case 0x4d495343: /* "MISC" */
-				/* Hacky... maybe there's a better way to identify this surface? */
-				if (surf->size == 0xc000)
-					isp->bt_surf = surf;
-				break;
-			}
 		}
-
-#ifdef APPLE_ISP_DEBUG
-		/* Only enabled in debug builds so it shouldn't matter, but
-		* the LOG surface is always the first surface requested.
-		*/
-		if (!test_bit(ISP_STATE_LOGGING, &isp->state))
-			set_bit(ISP_STATE_LOGGING, &isp->state);
-#endif
-		/* To the gc it goes... */
-
 	} else {
 		/* This should be the shared surface free request, but
 		 * 1) The fw doesn't request to free all of what it requested
 		 * 2) The fw continues to access the surface after
 		 * So we link it to the gc, which runs after fw shutdown
 		 */
-#ifdef APPLE_ISP_DEBUG
-		if (test_bit(ISP_STATE_LOGGING, &isp->state))
-			clear_bit(ISP_STATE_LOGGING, &isp->state);
-#endif
 		rsp->arg0 = req->arg0 | ISP_IPC_FLAG_ACK;
 		rsp->arg1 = 0x0;
 		rsp->arg2 = 0x0;