samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Çatalla 0
Kod Konular Değişiklik İstekleri İşlemler Paketler Projeler Sürüm Wiki Aktivite

Merge "msm: camera: core: v780 enhanced memory addresses" into camera-kernel.lnx.5.0

Kaynağa Gözat
Bu işleme şunda yer alıyor:
Savita Patted
2021-07-08 13:23:13 -07:00
işlemeyi yapan: Gerrit - the friendly Code Review server
ebeveyn 44d4c40b5f 0d00f4feee
işleme a1e328751b
18 değiştirilmiş dosya ile 163 ekleme ve 127 silme
Yama Dosyasını İndir Diff Dosyasını İndir Tüm dosyaları genişlet Tüm dosyaları daralt

20
drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c
Dosyayı Görüntüle

@@ -354,7 +354,7 @@ static int cam_ope_dump_hang_patches(struct cam_packet *packet,
for (i = 0; i < packet->num_patches; i++) {
rc = cam_mem_get_io_buf(patch_desc[i].src_buf_hdl,
iommu_hdl, &iova_addr, &src_buf_size);
iommu_hdl, &iova_addr, &src_buf_size, NULL);
if (rc < 0) {
CAM_ERR(CAM_UTIL,
"get src buf address failed for handle 0x%x",
@@ -380,7 +380,7 @@ static int cam_ope_dump_direct(struct ope_cmd_buf_info *cmd_buf_info,
int rc = 0;
rc = cam_mem_get_io_buf(cmd_buf_info->mem_handle,
ope_hw_mgr->iommu_hdl, &iova_addr, &size);
ope_hw_mgr->iommu_hdl, &iova_addr, &size, NULL);
if (rc < 0) {
CAM_ERR(CAM_UTIL, "get cmd buf addressfailed for handle 0x%x",
cmd_buf_info->mem_handle);
@@ -498,7 +498,7 @@ static int cam_ope_mgr_dump_frame_set(uintptr_t frame_process_addr,
for (i = 0; i < frame_process->frame_set[j].num_io_bufs; i++) {
io_buf = &frame_process->frame_set[j].io_buf[i];
rc = cam_mem_get_io_buf(io_buf->mem_handle[0],
ope_hw_mgr->iommu_hdl, &iova_addr, &size);
ope_hw_mgr->iommu_hdl, &iova_addr, &size, NULL);
if (rc) {
CAM_ERR(CAM_OPE, "get io buf fail 0x%x",
io_buf->mem_handle[0]);
@@ -572,7 +572,7 @@ static int cam_ope_dump_bls(struct cam_ope_request *ope_req,
cdm_cmd = ope_req->cdm_cmd;
for (i = 0; i < cdm_cmd->cmd_arrary_count; i++) {
rc = cam_mem_get_io_buf(cdm_cmd->cmd[i].bl_addr.mem_handle,
ope_hw_mgr->iommu_hdl, &iova_addr, &size);
ope_hw_mgr->iommu_hdl, &iova_addr, &size, NULL);
if (rc) {
CAM_ERR(CAM_OPE, "get io buf fail 0x%x",
cdm_cmd->cmd[i].bl_addr.mem_handle);
@@ -2012,12 +2012,12 @@ static int cam_ope_mgr_process_cmd_io_buf_req(struct cam_ope_hw_mgr *hw_mgr,
rc = cam_mem_get_io_buf(
in_io_buf->mem_handle[k],
hw_mgr->iommu_sec_hdl,
&iova_addr, &len);
&iova_addr, &len, NULL);
else
rc = cam_mem_get_io_buf(
in_io_buf->mem_handle[k],
hw_mgr->iommu_hdl,
&iova_addr, &len);
&iova_addr, &len, NULL);
if (rc) {
CAM_ERR(CAM_OPE, "get buf failed: %d",
@@ -2137,7 +2137,7 @@ static int cam_ope_mgr_process_cmd_buf_req(struct cam_ope_hw_mgr *hw_mgr,
switch (cmd_buf->cmd_buf_scope) {
case OPE_CMD_BUF_SCOPE_FRAME: {
rc = cam_mem_get_io_buf(cmd_buf->mem_handle,
hw_mgr->iommu_hdl, &iova_addr, &len);
hw_mgr->iommu_hdl, &iova_addr, &len, NULL);
if (rc) {
CAM_ERR(CAM_OPE, "get cmd buffailed %x",
hw_mgr->iommu_hdl);
@@ -2146,8 +2146,7 @@ static int cam_ope_mgr_process_cmd_buf_req(struct cam_ope_hw_mgr *hw_mgr,
iova_addr = iova_addr + cmd_buf->offset;
rc = cam_mem_get_io_buf(cmd_buf->mem_handle,
hw_mgr->iommu_cdm_hdl,
&iova_cdm_addr, &len);
hw_mgr->iommu_cdm_hdl, &iova_cdm_addr, &len, NULL);
if (rc) {
CAM_ERR(CAM_OPE, "get cmd buffailed %x",
hw_mgr->iommu_hdl);
@@ -4211,7 +4210,7 @@ iodump:
hw_mgr->iommu_sec_hdl :
hw_mgr->iommu_hdl;
rc = cam_mem_get_io_buf(io_cfg[i].mem_handle[j],
mmu_hdl, &iova_addr, &src_buf_size);
mmu_hdl, &iova_addr, &src_buf_size, NULL);
if (rc < 0) {
CAM_ERR(CAM_UTIL, "get src buf address fail");
continue;
@@ -4248,4 +4247,3 @@ iodump:
return;
}
}

8
drivers/cam_ope/ope_hw_mgr/ope_hw/ope_core.c
Dosyayı Görüntüle

@@ -548,7 +548,7 @@ static uint32_t *ope_create_frame_cmd_batch(struct cam_ope_hw_mgr *hw_mgr,
rc = cam_mem_get_io_buf(
frm_proc->cmd_buf[i][j].mem_handle,
hw_mgr->iommu_cdm_hdl, &iova_addr, &buf_len);
hw_mgr->iommu_cdm_hdl, &iova_addr, &buf_len, NULL);
if (rc) {
CAM_ERR(CAM_OPE, "get cmd buf failed %x",
hw_mgr->iommu_hdl);
@@ -705,7 +705,7 @@ static uint32_t *ope_create_frame_cmd(struct cam_ope_hw_mgr *hw_mgr,
rc = cam_mem_get_io_buf(
frm_proc->cmd_buf[i][j].mem_handle,
hw_mgr->iommu_cdm_hdl, &iova_addr, &buf_len);
hw_mgr->iommu_cdm_hdl, &iova_addr, &buf_len, NULL);
if (rc) {
CAM_ERR(CAM_OPE, "get cmd buf failed %x",
hw_mgr->iommu_hdl);
@@ -820,8 +820,7 @@ static uint32_t *ope_create_stripe_cmd(struct cam_ope_hw_mgr *hw_mgr,
CAM_DBG(CAM_OPE, "process stripe %d", stripe_idx);
rc = cam_mem_get_io_buf(frm_proc->cmd_buf[i][k].mem_handle,
hw_mgr->iommu_cdm_hdl,
&iova_addr, &buf_len);
hw_mgr->iommu_cdm_hdl, &iova_addr, &buf_len, NULL);
if (rc) {
CAM_DBG(CAM_OPE, "get cmd buf fail %x",
hw_mgr->iommu_hdl);
@@ -1804,4 +1803,3 @@ irqreturn_t cam_ope_irq(int irq_num, void *data)
return IRQ_HANDLED;
}