From: Jeongtae Park <jtp.park@samsung.com>
Date: Sun, 17 Jun 2018 07:46:19 +0000 (+0900)
Subject: [COMMON] fimc-is2: remove 'buf_box' in our quque
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=94f6c8a16f4f66b60480a4ca6fce35a53f33e0b5;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[COMMON] fimc-is2: remove 'buf_box' in our quque

Change-Id: I0182be2713807ecfa7b786bc3e92b74a35321484
Signed-off-by: Jeongtae Park <jtp.park@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 a35f889cfa50..5e20ca81e47c 100644
--- a/drivers/media/platform/exynos/fimc-is2/fimc-is-video.c
+++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-video.c
@@ -931,8 +931,6 @@ int fimc_is_queue_buffer_queue(struct fimc_is_queue *queue,
 
 	/* plane address is updated for checking everytime */
 	for (i = 0; i < image_planes; i++) {
-		queue->buf_box[index][i] = vbuf->ops->plane_cookie(vbuf, i);
-
 		/* get dmabuf_container */
 		dmabuf = dma_buf_get(vb->planes[i].m.fd);
 		if (IS_ERR_OR_NULL(dmabuf)) {
@@ -1008,7 +1006,6 @@ int fimc_is_queue_buffer_queue(struct fimc_is_queue *queue,
 	spare = image_planes * batch_size;
 
 	/* meta plane */
-	queue->buf_box[index][spare] = vbuf->ops->plane_cookie(vbuf, image_planes);
 	queue->buf_kva[index][spare] = vbuf->ops->plane_kvaddr(vbuf, image_planes);
 	if (!queue->buf_kva[index][spare]) {
 		mverr("plane_kvaddr is fail(%s)", vctx, video, framemgr->name);
@@ -1020,7 +1017,6 @@ int fimc_is_queue_buffer_queue(struct fimc_is_queue *queue,
 		ext_size = sizeof(struct camera2_shot_ext) - sizeof(struct camera2_shot);
 
 		frame->kvaddr_shot = queue->buf_kva[index][spare] + ext_size;
-		frame->cookie_shot = queue->buf_box[index][spare];
 		frame->shot = (struct camera2_shot *)frame->kvaddr_shot;
 		frame->shot_ext = (struct camera2_shot_ext *)queue->buf_kva[index][spare];
 		frame->shot_size = queue->framecfg.size[spare] - ext_size;
diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-video.h b/drivers/media/platform/exynos/fimc-is2/fimc-is-video.h
index 5dcd576f0f0b..1b238fcfbe33 100644
--- a/drivers/media/platform/exynos/fimc-is2/fimc-is-video.h
+++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-video.h
@@ -284,7 +284,6 @@ struct fimc_is_queue {
 	u32				buf_refcount;
 	ulong				buf_dva[FIMC_IS_MAX_BUFS][FIMC_IS_MAX_PLANES];
 	ulong				buf_kva[FIMC_IS_MAX_BUFS][FIMC_IS_MAX_PLANES];
-	ulong				buf_box[FIMC_IS_MAX_BUFS][FIMC_IS_MAX_PLANES];
 
 	/* for debugging */
 	u32				buf_req;