samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

msm: camera: cdm: Add CDM cmd_type WAIT in dump util

Telusuri Sumber 
CDM comp_wait is the new cmd_type used by IFE Master
to wait for trigger from slave. Add this type to
the dump command buffer routine.

CRs-Fixed: 2679783
Change-Id: I142cbd849141725cc05f3276c20ea1c0d59f7c3c
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
This commit is contained in:
Vishalsingh Hajeri
2020-05-06 02:03:55 -07:00
orang tua 1b7fd53958
melakukan 7d3f7b71b6
2 mengubah file dengan 23 tambahan dan 4 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/cam_cdm/cam_cdm_util.c
Melihat File

@@ -229,7 +229,7 @@ uint32_t cdm_required_size_changebase(void)
uint32_t cdm_required_size_comp_wait(void) uint32_t cdm_required_size_comp_wait(void)
{ {
return cdm_get_cmd_header_size(CAM_CDM_COMP_WAIT); return cdm_get_cmd_header_size(CAM_CDM_CMD_COMP_WAIT);
} }
uint32_t cdm_required_size_clear_comp_event(void) uint32_t cdm_required_size_clear_comp_event(void)
@@ -387,11 +387,11 @@ uint32_t *cdm_write_wait_comp_event(
struct cdm_wait_comp_event_cmd *pHeader = struct cdm_wait_comp_event_cmd *pHeader =
(struct cdm_wait_comp_event_cmd *)pCmdBuffer; (struct cdm_wait_comp_event_cmd *)pCmdBuffer;
pHeader->cmd = CAM_CDM_COMP_WAIT; pHeader->cmd = CAM_CDM_CMD_COMP_WAIT;
pHeader->mask1 = mask1; pHeader->mask1 = mask1;
pHeader->mask2 = mask2; pHeader->mask2 = mask2;
pCmdBuffer += cdm_get_cmd_header_size(CAM_CDM_COMP_WAIT); pCmdBuffer += cdm_get_cmd_header_size(CAM_CDM_CMD_COMP_WAIT);
return pCmdBuffer; return pCmdBuffer;
} }
@@ -793,6 +793,17 @@ static long cam_cdm_util_dump_change_base_cmd(uint32_t *cmd_buf_addr)
return ret; return ret;
} }
static long cam_cdm_util_dump_comp_wait_event_cmd(uint32_t *cmd_buf_addr)
{
long ret = 0;
ret += CDMCmdHeaderSizes[CAM_CDM_CMD_COMP_WAIT];
CAM_INFO(CAM_CDM, "WAIT_EVENT");
return ret;
}
static long cam_cdm_util_dump_perf_ctrl_cmd(uint32_t *cmd_buf_addr) static long cam_cdm_util_dump_perf_ctrl_cmd(uint32_t *cmd_buf_addr)
{ {
long ret = 0; long ret = 0;
@@ -846,6 +857,10 @@ void cam_cdm_util_dump_cmd_buf(
case CAM_CDM_CMD_PERF_CTRL: case CAM_CDM_CMD_PERF_CTRL:
buf_now += cam_cdm_util_dump_perf_ctrl_cmd(buf_now); buf_now += cam_cdm_util_dump_perf_ctrl_cmd(buf_now);
break; break;
case CAM_CDM_CMD_COMP_WAIT:
buf_now +=
cam_cdm_util_dump_comp_wait_event_cmd(buf_now);
break;
default: default:
CAM_ERR(CAM_CDM, "Invalid CMD: 0x%x buf 0x%x", CAM_ERR(CAM_CDM, "Invalid CMD: 0x%x buf 0x%x",
cmd, *buf_now); cmd, *buf_now);
@@ -1014,6 +1029,10 @@ int cam_cdm_util_dump_cmd_bufs_v2(
buf_now += cdm_get_cmd_header_size( buf_now += cdm_get_cmd_header_size(
CAM_CDM_CMD_PERF_CTRL); CAM_CDM_CMD_PERF_CTRL);
break; break;
case CAM_CDM_CMD_COMP_WAIT:
buf_now += cdm_get_cmd_header_size(
CAM_CDM_CMD_COMP_WAIT);
break;
default: default:
CAM_ERR(CAM_CDM, "Invalid CMD: 0x%x", cmd); CAM_ERR(CAM_CDM, "Invalid CMD: 0x%x", cmd);
buf_now++; buf_now++;

2
drivers/cam_cdm/cam_cdm_util.h
Melihat File

@@ -24,7 +24,7 @@ enum cam_cdm_command {
CAM_CDM_CMD_PERF_CTRL = 0x9, CAM_CDM_CMD_PERF_CTRL = 0x9,
CAM_CDM_CMD_DMI_32 = 0xa, CAM_CDM_CMD_DMI_32 = 0xa,
CAM_CDM_CMD_DMI_64 = 0xb, CAM_CDM_CMD_DMI_64 = 0xb,
CAM_CDM_COMP_WAIT = 0xc, CAM_CDM_CMD_COMP_WAIT = 0xc,
CAM_CDM_CLEAR_COMP_WAIT = 0xd, CAM_CDM_CLEAR_COMP_WAIT = 0xd,
CAM_CDM_WAIT_PREFETCH_DISABLE = 0xe, CAM_CDM_WAIT_PREFETCH_DISABLE = 0xe,
CAM_CDM_CMD_PRIVATE_BASE = 0xf, CAM_CDM_CMD_PRIVATE_BASE = 0xf,