From dcb30e02dcf43247e95e19a6f896ab11a91b0d00 Mon Sep 17 00:00:00 2001 From: Eunyoung Lee Date: Fri, 15 Jun 2018 11:15:38 +0900 Subject: [PATCH] [COMMON] fimc-is2: fix a bug in updating kvaddr_buffer Change-Id: Ifbdaa4ab1fde1042b8b1a5a01e6f70b15eb28e13 Signed-off-by: Eunyoung Lee --- drivers/media/platform/exynos/fimc-is2/fimc-is-video.c | 10 ++++++++++ 1 file changed, 10 insertions(+) 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; -- 2.20.1