From: Eunyoung Lee <ey470.lee@samsung.com>
Date: Fri, 15 Jun 2018 02:15:38 +0000 (+0900)
Subject: [COMMON] fimc-is2: fix a bug in updating kvaddr_buffer
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dcb30e02dcf43247e95e19a6f896ab11a91b0d00;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[COMMON] fimc-is2: fix a bug in updating kvaddr_buffer

Change-Id: Ifbdaa4ab1fde1042b8b1a5a01e6f70b15eb28e13
Signed-off-by: Eunyoung Lee <ey470.lee@samsung.com>
---

diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-video.c b/drivers/media/platform/exynos/fimc-is2/fimc-is-video.c
index 39c4478f5125..6b9ebdbc5445 100644
--- a/drivers/media/platform/exynos/fimc-is2/fimc-is-video.c
+++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-video.c
@@ -1047,6 +1047,16 @@ int fimc_is_queue_buffer_queue(struct fimc_is_queue *queue,
 				goto exit;
 			}
 		}
+		if (frame->kvaddr_buffer[i] != queue->buf_kva[index][i]) {
+			if (video->resourcemgr->hal_version == IS_HAL_VER_3_2) {
+				frame->kvaddr_buffer[i] = queue->buf_kva[index][i];
+			} else {
+				mverr("kvaddr buffer[%d][%d] is changed(%08X != %08lX)", vctx, video, index, i,
+					frame->kvaddr_buffer[i], queue->buf_kva[index][i]);
+				ret = -EINVAL;
+				goto exit;
+			}
+		}
 	}
 
 	goto exit;