samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: memmgr: Add error handling get slot failure" into camera-kernel.lnx.4.0

Browse Source
This commit is contained in:
Camera Software Integration
2020-10-06 12:28:17 -07:00
committed by Gerrit - the friendly Code Review server
parent 3c4241c06a 58588fb689
commit 315368fc57
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/cam_req_mgr/cam_mem_mgr.c
View File

@@ -830,6 +830,14 @@ int cam_mem_mgr_map(struct cam_mem_mgr_map_cmd *cmd)
is_internal = cam_mem_util_is_map_internal(cmd->fd); is_internal = cam_mem_util_is_map_internal(cmd->fd);
idx = cam_mem_get_slot();
if (idx < 0) {
CAM_ERR(CAM_MEM, "Failed in getting mem slot, idx=%d, fd=%d",
idx, cmd->fd);
rc = -ENOMEM;
goto slot_fail;
}
if ((cmd->flags & CAM_MEM_FLAG_HW_READ_WRITE) || if ((cmd->flags & CAM_MEM_FLAG_HW_READ_WRITE) ||
(cmd->flags & CAM_MEM_FLAG_PROTECTED_MODE)) { (cmd->flags & CAM_MEM_FLAG_PROTECTED_MODE)) {
rc = cam_mem_util_map_hw_va(cmd->flags, rc = cam_mem_util_map_hw_va(cmd->flags,
@@ -855,12 +863,6 @@ int cam_mem_mgr_map(struct cam_mem_mgr_map_cmd *cmd)
} }
} }
idx = cam_mem_get_slot();
if (idx < 0) {
rc = -ENOMEM;
goto map_fail;
}
mutex_lock(&tbl.bufq[idx].q_lock); mutex_lock(&tbl.bufq[idx].q_lock);
tbl.bufq[idx].fd = cmd->fd; tbl.bufq[idx].fd = cmd->fd;
tbl.bufq[idx].dma_buf = NULL; tbl.bufq[idx].dma_buf = NULL;
@@ -893,8 +895,9 @@ int cam_mem_mgr_map(struct cam_mem_mgr_map_cmd *cmd)
tbl.bufq[idx].len); tbl.bufq[idx].len);
return rc; return rc;
map_fail: map_fail:
cam_mem_put_slot(idx);
slot_fail:
dma_buf_put(dmabuf); dma_buf_put(dmabuf);
return rc; return rc;
} }
@@ -1266,6 +1269,7 @@ int cam_mem_mgr_request_mem(struct cam_mem_mgr_request_desc *inp,
idx = cam_mem_get_slot(); idx = cam_mem_get_slot();
if (idx < 0) { if (idx < 0) {
CAM_ERR(CAM_MEM, "Failed in getting mem slot, idx=%d", idx);
rc = -ENOMEM; rc = -ENOMEM;
goto slot_fail; goto slot_fail;
} }
@@ -1414,6 +1418,7 @@ int cam_mem_mgr_reserve_memory_region(struct cam_mem_mgr_request_desc *inp,
idx = cam_mem_get_slot(); idx = cam_mem_get_slot();
if (idx < 0) { if (idx < 0) {
CAM_ERR(CAM_MEM, "Failed in getting mem slot, idx=%d", idx);
rc = -ENOMEM; rc = -ENOMEM;
goto slot_fail; goto slot_fail;
} }