Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef65a6e5 authored by Petar Sivenov's avatar Petar Sivenov
Browse files

msm: camera: Fix inconsistent behavior of VFE_READ_DMI_64BIT 



VFE_READ_DMI_64BIT behavior is not consistent with VFE_WRITE_DMI_64BIT
The latter accepts array of 64bit values as an input to write to HW,
while the former reads the data from hw into two separate arrays - one
for the hi words and one for the low words.
This patch makes read consistent with write - it will read data in one
64bit array.

Change-Id: Iac8b46ca0893705b0e4b1713e78225dc3eb430ad
Signed-off-by: default avatarPetar Sivenov <psiven@codeaurora.org>
parent 14a5d3a3

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

+4 −1
Original line number Diff line number Diff line
@@ -560,7 +560,8 @@ static int msm_isp_send_hw_cmd(struct vfe_device *vfe_dev, 
			if (reg_cfg_cmd->cmd_type == VFE_READ_DMI_64BIT) {

				hi_val = msm_camera_io_r(vfe_dev->vfe_base +

					vfe_dev->hw_info->dmi_reg_offset);

				*hi_tbl_ptr++ = hi_val;

				*hi_tbl_ptr = hi_val;

				hi_tbl_ptr += 2;

			}



			lo_val = msm_camera_io_r(vfe_dev->vfe_base +
@@ -572,6 +573,8 @@ static int msm_isp_send_hw_cmd(struct vfe_device *vfe_dev, 
				lo_val |= lo_val1 << 16;

			}

			*lo_tbl_ptr++ = lo_val;

			if (reg_cfg_cmd->cmd_type == VFE_READ_DMI_64BIT)

				lo_tbl_ptr++;

		}

		break;

	}