[COMMON] fimc-is2: move structure for capture node address info

The structure for capture node address info
is moved from meta data to framemgr.

 PR JIRA ID: CPR-153

Change-Id: I15353f17ff267263792db36e737226533838d761
Signed-off-by: Wooki Min <wooki.min@samsung.com>

diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-core.c b/drivers/media/platform/exynos/fimc-is2/fimc-is-core.c
index f31b09247287163538196eba54d96246d19e9c6d..0adb9d760c6bb7b5779c48015f9739076c67e4bd 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/fimc-is-core.c
+++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-core.c
@@ -173,56 +173,56 @@ static int fimc_is_resume(struct device *dev)
 }
 
 #ifdef ENABLE_FAULT_HANDLER
-static void fimc_is_print_target_dva(struct camera2_shot *shot)
+static void fimc_is_print_target_dva(struct fimc_is_frame *leader_frame)
 {
        u32 plane_index;
 
        for (plane_index = 0; plane_index < FIMC_IS_MAX_PLANES; plane_index++) {
-               if (shot->uctl.scalerUd.sourceAddress[plane_index])
+               if (leader_frame->sourceAddress[plane_index])
                        pr_err("sourceAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.sourceAddress[plane_index]);
-               if (shot->uctl.scalerUd.txcTargetAddress[plane_index])
+                               plane_index, leader_frame->sourceAddress[plane_index]);
+               if (leader_frame->txcTargetAddress[plane_index])
                        pr_err("txcTargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.txcTargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.txpTargetAddress[plane_index])
+                               plane_index, leader_frame->txcTargetAddress[plane_index]);
+               if (leader_frame->txpTargetAddress[plane_index])
                        pr_err("txpTargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.txpTargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.ixcTargetAddress[plane_index])
+                               plane_index, leader_frame->txpTargetAddress[plane_index]);
+               if (leader_frame->ixcTargetAddress[plane_index])
                        pr_err("ixcTargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.ixcTargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.ixpTargetAddress[plane_index])
+                               plane_index, leader_frame->ixcTargetAddress[plane_index]);
+               if (leader_frame->ixpTargetAddress[plane_index])
                        pr_err("ixpTargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.ixpTargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.mexcTargetAddress[plane_index])
+                               plane_index, leader_frame->ixpTargetAddress[plane_index]);
+               if (leader_frame->mexcTargetAddress[plane_index])
                        pr_err("mexcTargetAddress[%d] = 0x%16LX\n",
-                               plane_index, shot->uctl.scalerUd.mexcTargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.sccTargetAddress[plane_index])
+                               plane_index, leader_frame->mexcTargetAddress[plane_index]);
+               if (leader_frame->sccTargetAddress[plane_index])
                        pr_err("sccTargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.sccTargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.scpTargetAddress[plane_index])
+                               plane_index, leader_frame->sccTargetAddress[plane_index]);
+               if (leader_frame->scpTargetAddress[plane_index])
                        pr_err("scpTargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.scpTargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.sc0TargetAddress[plane_index])
+                               plane_index, leader_frame->scpTargetAddress[plane_index]);
+               if (leader_frame->sc0TargetAddress[plane_index])
                        pr_err("sc0TargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.sc0TargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.sc1TargetAddress[plane_index])
+                               plane_index, leader_frame->sc0TargetAddress[plane_index]);
+               if (leader_frame->sc1TargetAddress[plane_index])
                        pr_err("sc1TargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.sc1TargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.sc2TargetAddress[plane_index])
+                               plane_index, leader_frame->sc1TargetAddress[plane_index]);
+               if (leader_frame->sc2TargetAddress[plane_index])
                        pr_err("sc2TargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.sc2TargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.sc3TargetAddress[plane_index])
+                               plane_index, leader_frame->sc2TargetAddress[plane_index]);
+               if (leader_frame->sc3TargetAddress[plane_index])
                        pr_err("sc3TargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.sc3TargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.sc4TargetAddress[plane_index])
+                               plane_index, leader_frame->sc3TargetAddress[plane_index]);
+               if (leader_frame->sc4TargetAddress[plane_index])
                        pr_err("sc4TargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.sc4TargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.sc5TargetAddress[plane_index])
+                               plane_index, leader_frame->sc4TargetAddress[plane_index]);
+               if (leader_frame->sc5TargetAddress[plane_index])
                        pr_err("sc5TargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.sc5TargetAddress[plane_index]);
-               if (shot->uctl.scalerUd.dxcTargetAddress[plane_index])
+                               plane_index, leader_frame->sc5TargetAddress[plane_index]);
+               if (leader_frame->dxcTargetAddress[plane_index])
                        pr_err("dxcTargetAddress[%d] = 0x%08X\n",
-                               plane_index, shot->uctl.scalerUd.dxcTargetAddress[plane_index]);
+                               plane_index, leader_frame->dxcTargetAddress[plane_index]);
        }
 }
 
@@ -243,7 +243,7 @@ void fimc_is_print_frame_dva(struct fimc_is_subdev *subdev)
 
                                shot = framemgr->frames[j].shot;
                                if (shot)
-                                       fimc_is_print_target_dva(shot);
+                                       fimc_is_print_target_dva(&framemgr->frames[j]);
                        }
                }
        }

diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-framemgr.h b/drivers/media/platform/exynos/fimc-is2/fimc-is-framemgr.h
index 3aa21eb05924a30f453552e0ee5a52c292fa2629..463db356b57b49ced3059e0e13411ae4310b4ebd 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/fimc-is-framemgr.h
+++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-framemgr.h
@@ -208,6 +208,29 @@ struct fimc_is_frame {
        u32                     dvaddr_buffer[FIMC_IS_MAX_PLANES];
        ulong           kvaddr_buffer[FIMC_IS_MAX_PLANES];
 
+       /*
+        * target address for capture node
+        * [0] invalid address, stop
+        * [others] valid address
+        */
+       u32 sourceAddress[FIMC_IS_MAX_PLANES]; /* DC1S: DCP slave input DMA */
+       u32 txcTargetAddress[FIMC_IS_MAX_PLANES]; /* 3AA capture DMA */
+       u32 txpTargetAddress[FIMC_IS_MAX_PLANES]; /* 3AA preview DMA */
+       u32 mrgTargetAddress[FIMC_IS_MAX_PLANES];
+       u32 efdTargetAddress[FIMC_IS_MAX_PLANES];
+       u32 ixcTargetAddress[FIMC_IS_MAX_PLANES];
+       u32 ixpTargetAddress[FIMC_IS_MAX_PLANES];
+       u64 mexcTargetAddress[FIMC_IS_MAX_PLANES]; /* ME out DMA */
+       u32 sccTargetAddress[FIMC_IS_MAX_PLANES]; /* DC0S: DCP master capture DMA */
+       u32 scpTargetAddress[FIMC_IS_MAX_PLANES]; /* DC1S: DCP slave capture DMA */
+       u32 sc0TargetAddress[FIMC_IS_MAX_PLANES];
+       u32 sc1TargetAddress[FIMC_IS_MAX_PLANES];
+       u32 sc2TargetAddress[FIMC_IS_MAX_PLANES];
+       u32 sc3TargetAddress[FIMC_IS_MAX_PLANES];
+       u32 sc4TargetAddress[FIMC_IS_MAX_PLANES];
+       u32 sc5TargetAddress[FIMC_IS_MAX_PLANES];
+       u32 dxcTargetAddress[FIMC_IS_MAX_PLANES]; /* DC2S: DCP disparity capture DMA */
+
        /* multi-buffer use */
        u32                     num_buffers; /* total number of buffers per frame */
        u32                     cur_buf_index; /* current processed buffer index */

diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-groupmgr.c b/drivers/media/platform/exynos/fimc-is2/fimc-is-groupmgr.c
index b381b77bfb0e21584d329cd180aadbe4f1754250..ac0d5747a2ceb25814b35aac1e61e045992b6ad2 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/fimc-is-groupmgr.c
+++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-groupmgr.c
@@ -2511,15 +2511,6 @@ int fimc_is_group_buffer_queue(struct fimc_is_groupmgr *groupmgr,
                                }
                }
 
-               /* orientation is set by user */
-               orientation = frame->shot->uctl.scalerUd.orientation;
-               for (i = 0; i < INTERFACE_TYPE_MAX; i++)
-                       backup_mcsc_blk_port[i] = frame->shot->uctl.scalerUd.mcsc_sub_blk_port[i];
-               memset(&frame->shot->uctl.scalerUd, 0, sizeof(struct camera2_scaler_uctl));
-               frame->shot->uctl.scalerUd.orientation = orientation;
-               for (i = 0; i < INTERFACE_TYPE_MAX; i++)
-                       frame->shot->uctl.scalerUd.mcsc_sub_blk_port[i] = backup_mcsc_blk_port[i];
-
                frame->lindex = 0;
                frame->hindex = 0;
                frame->result = 0;

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c
index b0d0fda764e434a4707b1b8c0a741485396ce6bc..ee09c3601aed9f388ddabc650e2c8ac0c62d5ca0 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c
@@ -371,8 +371,8 @@ static int fimc_is_hw_3aa_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame
                                FIMC_BUG(1);
                        }
 
-                       param_set->output_kva_me[i] = frame->shot->uctl.scalerUd.mexcTargetAddress[i];
-                       if (frame->shot->uctl.scalerUd.mexcTargetAddress[i] == 0) {
+                       param_set->output_kva_me[i] = frame->mexcTargetAddress[i];
+                       if (frame->mexcTargetAddress[i] == 0) {
                                msdbg_hw(2, "[F:%d]mexcTargetAddress[%d] is zero",
                                        frame->instance, hw_ip, frame->fcount, i);
                        }
@@ -385,8 +385,8 @@ static int fimc_is_hw_3aa_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame
 
        if (param_set->dma_output_before_bds.cmd != DMA_OUTPUT_COMMAND_DISABLE) {
                for (i = 0; i < frame->planes; i++) {
-                       param_set->output_dva_before_bds[i] = frame->shot->uctl.scalerUd.txcTargetAddress[i];
-                       if (frame->shot->uctl.scalerUd.txcTargetAddress[i] == 0) {
+                       param_set->output_dva_before_bds[i] = frame->txcTargetAddress[i];
+                       if (frame->txcTargetAddress[i] == 0) {
                                msinfo_hw("[F:%d]txcTargetAddress[%d] is zero\n",
                                        frame->instance, hw_ip, frame->fcount, i);
                                param_set->dma_output_before_bds.cmd = DMA_OUTPUT_COMMAND_DISABLE;
@@ -397,15 +397,15 @@ static int fimc_is_hw_3aa_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame
        if (param_set->dma_output_after_bds.cmd != DMA_OUTPUT_COMMAND_DISABLE) {
                for (i = 0; i < frame->planes; i++) {
 #if defined(SOC_3AAISP)
-                       param_set->output_dva_after_bds[i] = frame->shot->uctl.scalerUd.txcTargetAddress[i];
-                       if (frame->shot->uctl.scalerUd.txcTargetAddress[i] == 0) {
+                       param_set->output_dva_after_bds[i] = frame->txcTargetAddress[i];
+                       if (frame->txcTargetAddress[i] == 0) {
                                msinfo_hw("[F:%d]txcTargetAddress[%d] is zero\n",
                                        frame->instance, hw_ip, frame->fcount, i);
                                param_set->dma_output_after_bds.cmd = DMA_OUTPUT_COMMAND_DISABLE;
                        }
 #else
-                       param_set->output_dva_after_bds[i] = frame->shot->uctl.scalerUd.txpTargetAddress[i];
-                       if (frame->shot->uctl.scalerUd.txpTargetAddress[i] == 0) {
+                       param_set->output_dva_after_bds[i] = frame->txpTargetAddress[i];
+                       if (frame->txpTargetAddress[i] == 0) {
                                msinfo_hw("[F:%d]txpTargetAddress[%d] is zero\n",
                                        frame->instance, hw_ip, frame->fcount, i);
                                param_set->dma_output_after_bds.cmd = DMA_OUTPUT_COMMAND_DISABLE;
@@ -418,8 +418,8 @@ static int fimc_is_hw_3aa_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame
 
        if (param_set->dma_output_efd.cmd != DMA_OUTPUT_COMMAND_DISABLE) {
                for (i = 0; i < param->efd_output.plane; i++) {
-                       param_set->output_dva_efd[i] = frame->shot->uctl.scalerUd.efdTargetAddress[i];
-                       if (frame->shot->uctl.scalerUd.efdTargetAddress[i] == 0) {
+                       param_set->output_dva_efd[i] = frame->efdTargetAddress[i];
+                       if (frame->efdTargetAddress[i] == 0) {
                                msinfo_hw("[F:%d]efdTargetAddress[%d] is zero\n",
                                        frame->instance, hw_ip, frame->fcount, i);
                                param_set->dma_output_efd.cmd = DMA_OUTPUT_COMMAND_DISABLE;
@@ -429,8 +429,8 @@ static int fimc_is_hw_3aa_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame
 
        if (param_set->dma_output_mrg.cmd != DMA_OUTPUT_COMMAND_DISABLE) {
                for (i = 0; i < frame->planes; i++) {
-                       param_set->output_dva_mrg[i] = frame->shot->uctl.scalerUd.mrgTargetAddress[i];
-                       if (frame->shot->uctl.scalerUd.mrgTargetAddress[i] == 0) {
+                       param_set->output_dva_mrg[i] = frame->mrgTargetAddress[i];
+                       if (frame->mrgTargetAddress[i] == 0) {
                                msinfo_hw("[F:%d]mrgTargetAddress[%d] is zero\n",
                                        frame->instance, hw_ip, frame->fcount, i);
                                param_set->dma_output_mrg.cmd = DMA_OUTPUT_COMMAND_DISABLE;

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c
index 270c854d05338a0c6419fcd53a5b02cf2301d7ac..fc95e7a52f739cd4615c7b04eb4734a8f9cf429c 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c
@@ -529,10 +529,26 @@ static inline void fimc_is_hardware_fill_frame_info(u32 instance,
        hw_frame->out_flag      = GET_OUT_FLAG_IN_DEVICE(FIMC_IS_DEVICE_ISCHAIN, frame->out_flag);
        hw_frame->core_flag     = 0;
        atomic_set(&hw_frame->shot_done_flag, 1);
-       for (i = 0; i < FIMC_IS_MAX_PLANES; i++) {
-               hw_frame->dvaddr_buffer[i] = frame->dvaddr_buffer[i];
-               hw_frame->kvaddr_buffer[i] = frame->kvaddr_buffer[i];
-       }
+
+       memcpy(hw_frame->dvaddr_buffer, frame->dvaddr_buffer, sizeof(frame->dvaddr_buffer));
+       memcpy(hw_frame->kvaddr_buffer, frame->kvaddr_buffer, sizeof(frame->kvaddr_buffer));
+       memcpy(hw_frame->txcTargetAddress, frame->txcTargetAddress, sizeof(frame->txcTargetAddress));
+       memcpy(hw_frame->txpTargetAddress, frame->txpTargetAddress, sizeof(frame->txpTargetAddress));
+       memcpy(hw_frame->mrgTargetAddress, frame->mrgTargetAddress, sizeof(frame->mrgTargetAddress));
+       memcpy(hw_frame->efdTargetAddress, frame->efdTargetAddress, sizeof(frame->efdTargetAddress));
+       memcpy(hw_frame->ixcTargetAddress, frame->ixcTargetAddress, sizeof(frame->ixcTargetAddress));
+       memcpy(hw_frame->ixpTargetAddress, frame->ixpTargetAddress, sizeof(frame->ixpTargetAddress));
+       memcpy(hw_frame->mexcTargetAddress, frame->mexcTargetAddress, sizeof(frame->mexcTargetAddress));
+       memcpy(hw_frame->sccTargetAddress, frame->sccTargetAddress, sizeof(frame->sccTargetAddress));
+       memcpy(hw_frame->scpTargetAddress, frame->scpTargetAddress, sizeof(frame->scpTargetAddress));
+       memcpy(hw_frame->sc0TargetAddress, frame->sc0TargetAddress, sizeof(frame->sc0TargetAddress));
+       memcpy(hw_frame->sc1TargetAddress, frame->sc1TargetAddress, sizeof(frame->sc1TargetAddress));
+       memcpy(hw_frame->sc2TargetAddress, frame->sc2TargetAddress, sizeof(frame->sc2TargetAddress));
+       memcpy(hw_frame->sc3TargetAddress, frame->sc3TargetAddress, sizeof(frame->sc3TargetAddress));
+       memcpy(hw_frame->sc4TargetAddress, frame->sc4TargetAddress, sizeof(frame->sc4TargetAddress));
+       memcpy(hw_frame->sc5TargetAddress, frame->sc5TargetAddress, sizeof(frame->sc5TargetAddress));
+       memcpy(hw_frame->dxcTargetAddress, frame->dxcTargetAddress, sizeof(frame->dxcTargetAddress));
+
        hw_frame->instance = instance;
 }
 

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-dcp.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-dcp.c
index 7875d5103a483f347924633c5863b441710d5d4e..103eca6f9b62aeb49a0939d841e02b52ad79c641 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-dcp.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-dcp.c
@@ -342,7 +342,7 @@ int fimc_is_hw_dcp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame *frame
        if (param_set->dma_input_s.cmd == DMA_INPUT_COMMAND_ENABLE) {
                for (i = 0; i < plane; i++) {
                        param_set->input_dva[DCP_DMA_IN_GDC_SLAVE][i] =
-                               frame->shot->uctl.scalerUd.sourceAddress[i];
+                               frame->sourceAddress[i];
                        if (param_set->input_dva[DCP_DMA_IN_GDC_SLAVE][i] == 0) {
                                mserr_hw("[F:%d]DCP_DMA_IN_GDC_SLAVE plane[%d]dva is zero",
                                        frame->instance, hw_ip, frame->fcount, i);
@@ -356,7 +356,7 @@ int fimc_is_hw_dcp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame *frame
        if (param_set->dma_output_m.cmd == DMA_INPUT_COMMAND_ENABLE) {
                for (i = 0; i < plane; i++) {
                        param_set->output_dva[DCP_DMA_OUT_MASTER][i] =
-                               frame->shot->uctl.scalerUd.sccTargetAddress[i];
+                               frame->sccTargetAddress[i];
                        if (param_set->output_dva[DCP_DMA_OUT_MASTER][i] == 0) {
                                mserr_hw("[F:%d]DCP_DMA_OUT_MASTER plane[%d] dva is zero",
                                        frame->instance, hw_ip, frame->fcount, i);
@@ -370,7 +370,7 @@ int fimc_is_hw_dcp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame *frame
        if (param_set->dma_output_s.cmd == DMA_INPUT_COMMAND_ENABLE) {
                for (i = 0; i < plane; i++) {
                        param_set->output_dva[DCP_DMA_OUT_SLAVE][i] =
-                               frame->shot->uctl.scalerUd.scpTargetAddress[i];
+                               frame->scpTargetAddress[i];
                        if (param_set->output_dva[DCP_DMA_OUT_SLAVE][i] == 0) {
                                mserr_hw("[F:%d]DCP_DMA_OUT_SLAVE plane[%d] dva is zero",
                                        frame->instance, hw_ip, frame->fcount, i);
@@ -387,7 +387,7 @@ int fimc_is_hw_dcp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame *frame
 
                /* disparity output: currnet data */
                param_set->output_dva[DCP_DMA_OUT_DISPARITY][0] =
-                       frame->shot->uctl.scalerUd.dxcTargetAddress[0];
+                       frame->dxcTargetAddress[0];
                if (param_set->output_dva[DCP_DMA_OUT_DISPARITY][0] == 0) {
                        mserr_hw("[F:%d]DCP_DMA_OUT_DISPARITY plane[%d] dva is zero",
                                frame->instance, hw_ip, frame->fcount, 0);
@@ -400,7 +400,7 @@ int fimc_is_hw_dcp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame *frame
        if (param_set->dma_output_m_ds.cmd == DMA_INPUT_COMMAND_ENABLE) {
                for (i = 0; i < plane; i++) {
                        param_set->output_dva[DCP_DMA_OUT_MASTER_DS][i] =
-                               frame->shot->uctl.scalerUd.sccTargetAddress[8 + i];
+                               frame->sccTargetAddress[8 + i];
 
                        if (param_set->output_dva[DCP_DMA_OUT_MASTER_DS][i] == 0) {
                                mserr_hw("[F:%d]DCP_DMA_OUT_MASTER_DS plane[%d] dva is zero",
@@ -415,7 +415,7 @@ int fimc_is_hw_dcp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame *frame
        if (param_set->dma_output_s_ds.cmd == DMA_INPUT_COMMAND_ENABLE) {
                for (i = 0; i < plane; i++) {
                        param_set->output_dva[DCP_DMA_OUT_SLAVE_DS][i] =
-                               frame->shot->uctl.scalerUd.scpTargetAddress[8 + i];
+                               frame->scpTargetAddress[8 + i];
                        if (param_set->output_dva[DCP_DMA_OUT_SLAVE_DS][i] == 0) {
                                mserr_hw("[F:%d]DCP_DMA_OUT_SLAVE_DS plane[%d] dva is zero",
                                        frame->instance, hw_ip, frame->fcount, i);

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c
index b26e22bd64ce5a8a2eaad4d48e2b7b5dbd6f5835..68c1fc15db47391a6bc3a5ed68baa1c7e2356f18 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c
@@ -353,8 +353,8 @@ static int fimc_is_hw_isp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame
                                FIMC_BUG(1);
                        }
 
-                       param_set->output_kva_me[i] = frame->shot->uctl.scalerUd.mexcTargetAddress[frame->cur_buf_index + i];
-                       if (frame->shot->uctl.scalerUd.mexcTargetAddress[i] == 0) {
+                       param_set->output_kva_me[i] = frame->mexcTargetAddress[frame->cur_buf_index + i];
+                       if (frame->mexcTargetAddress[i] == 0) {
                                msdbg_hw(2, "[F:%d]mexcTargetAddress[%d] is zero",
                                        frame->instance, hw_ip, frame->fcount, i);
                        }
@@ -363,8 +363,8 @@ static int fimc_is_hw_isp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame
 
        if (param_set->dma_output_chunk.cmd != DMA_OUTPUT_COMMAND_DISABLE) {
                for (i = 0; i < frame->num_buffers; i++) {
-                       param_set->output_dva_chunk[i] = frame->shot->uctl.scalerUd.ixpTargetAddress[frame->cur_buf_index + i];
-                       if (frame->shot->uctl.scalerUd.ixpTargetAddress[i] == 0) {
+                       param_set->output_dva_chunk[i] = frame->ixpTargetAddress[frame->cur_buf_index + i];
+                       if (frame->ixpTargetAddress[i] == 0) {
                                msinfo_hw("[F:%d]ixpTargetAddress[%d] is zero",
                                        frame->instance, hw_ip, frame->fcount, i);
                                param_set->dma_output_chunk.cmd = DMA_OUTPUT_COMMAND_DISABLE;
@@ -374,8 +374,8 @@ static int fimc_is_hw_isp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame
 
        if (param_set->dma_output_yuv.cmd != DMA_OUTPUT_COMMAND_DISABLE) {
                for (i = 0; i < frame->num_buffers; i++) {
-                       param_set->output_dva_yuv[i] = frame->shot->uctl.scalerUd.ixcTargetAddress[frame->cur_buf_index + i];
-                       if (frame->shot->uctl.scalerUd.ixcTargetAddress[i] == 0) {
+                       param_set->output_dva_yuv[i] = frame->ixcTargetAddress[frame->cur_buf_index + i];
+                       if (frame->ixcTargetAddress[i] == 0) {
                                msinfo_hw("[F:%d]ixcTargetAddress[%d] is zero",
                                        frame->instance, hw_ip, frame->fcount, i);
                                param_set->dma_output_yuv.cmd = DMA_OUTPUT_COMMAND_DISABLE;

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v1.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v1.c
index a671a3c9ddadefa25f1f2a2e0c980f0107f02144..5013042ca731c5e070600b3397bf4b1444e0e5d1 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v1.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v1.c
@@ -320,9 +320,9 @@ static int fimc_is_hw_mcsc_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_fram
                lindex, hindex, frame->instance);
 
        /* set mcsc dma out addr */
-       target_addr[0] = frame->shot->uctl.scalerUd.scpTargetAddress[0];
-       target_addr[1] = frame->shot->uctl.scalerUd.scpTargetAddress[1];
-       target_addr[2] = frame->shot->uctl.scalerUd.scpTargetAddress[2];
+       target_addr[0] = frame->scpTargetAddress[0];
+       target_addr[1] = frame->scpTargetAddress[1];
+       target_addr[2] = frame->scpTargetAddress[2];
 
        msdbg_hw(2, "[F:%d]shot [T:%d] cmd[%d] addr[0x%x]\n",
                frame->instance, hw_ip, frame->fcount, frame->type,

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.c
index 98beabd3c57edbd0d6cba901b81d634513a64cd3..f79a34d5f43589f70cca3aeae031d557dc8ecac2 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.c
@@ -588,26 +588,26 @@ static u32 *hw_mcsc_get_target_addr(u32 out_id, struct fimc_is_frame *frame)
 
        switch (out_id) {
        case MCSC_OUTPUT0:
-               addr = frame->shot->uctl.scalerUd.sc0TargetAddress;
+               addr = frame->sc0TargetAddress;
                break;
        case MCSC_OUTPUT1:
-               addr = frame->shot->uctl.scalerUd.sc1TargetAddress;
+               addr = frame->sc1TargetAddress;
                break;
        case MCSC_OUTPUT2:
-               addr = frame->shot->uctl.scalerUd.sc2TargetAddress;
+               addr = frame->sc2TargetAddress;
                break;
        case MCSC_OUTPUT3:
-               addr = frame->shot->uctl.scalerUd.sc3TargetAddress;
+               addr = frame->sc3TargetAddress;
                break;
        case MCSC_OUTPUT4:
-               addr = frame->shot->uctl.scalerUd.sc4TargetAddress;
+               addr = frame->sc4TargetAddress;
                break;
        case MCSC_OUTPUT5:
-               addr = frame->shot->uctl.scalerUd.sc5TargetAddress;
+               addr = frame->sc5TargetAddress;
                break;
        default:
                err_hw("[F:%d] invalid output id(%d)\n", frame->fcount, out_id);
-               addr = frame->shot->uctl.scalerUd.sc0TargetAddress;
+               addr = frame->sc0TargetAddress;
                break;
        }
 

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-scp.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-scp.c
index 65a483f382f4f7a015db966bce4bb0350101ec7b..8059f99c7b158a84a98f4ee9c353b21c57dc2c15 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-scp.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-scp.c
@@ -229,9 +229,9 @@ static int fimc_is_hw_scp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame
        fimc_is_hw_scp_update_register(frame->instance, hw_ip, param);
 
        /* set scp dma out addr */
-       target_addr[0] = frame->shot->uctl.scalerUd.scpTargetAddress[0];
-       target_addr[1] = frame->shot->uctl.scalerUd.scpTargetAddress[1];
-       target_addr[2] = frame->shot->uctl.scalerUd.scpTargetAddress[2];
+       target_addr[0] = frame->scpTargetAddress[0];
+       target_addr[1] = frame->scpTargetAddress[1];
+       target_addr[2] = frame->scpTargetAddress[2];
 
        msdbg_hw(2, "[F:%d] target addr [0x%x]\n", frame->instance, hw_ip,
                frame->fcount, target_addr[0]);

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tpu.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tpu.c
index 442d008dc7fc30e96e5c3693af00ec917c1d8d5d..956af5f93c08d48b571c52ae9d6aa1507cd27b35 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tpu.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tpu.c
@@ -327,8 +327,8 @@ static int fimc_is_hw_tpu_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame
 
        if (param_set->dma_output.cmd != DMA_OUTPUT_COMMAND_DISABLE) {
                for (i = 0; i < frame->num_buffers; i++) {
-                       param_set->output_dva[i] = frame->shot->uctl.scalerUd.dxcTargetAddress[frame->cur_buf_index + i];
-                       if (frame->shot->uctl.scalerUd.dxcTargetAddress[i] == 0) {
+                       param_set->output_dva[i] = frame->dxcTargetAddress[frame->cur_buf_index + i];
+                       if (frame->dxcTargetAddress[i] == 0) {
                                msinfo_hw("[F:%d]dxcTargetAddress[%d] is zero",
                                        frame->instance, hw_ip, frame->fcount, i);
                                param_set->dma_output.cmd = DMA_OUTPUT_COMMAND_DISABLE;