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

Merge "msm: camera: sync: Add SYNC_CANCEL support in sync driver" into camera-kernel.lnx.4.0

Browse Source
This commit is contained in:
Camera Software Integration
2020-05-26 13:13:46 -07:00
committed by Gerrit - the friendly Code Review server
parent 6990de7ea5 74410fea6b
commit efaf7facfb
6 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/cam_isp/cam_isp_context.c
View File

@@ -2955,7 +2955,7 @@ static int __cam_isp_ctx_flush_req(struct cam_context *ctx,
req_isp->fence_map_out[i].sync_id);
rc = cam_sync_signal(
req_isp->fence_map_out[i].sync_id,
CAM_SYNC_STATE_SIGNALED_ERROR);
CAM_SYNC_STATE_SIGNALED_CANCEL);
if (rc) {
tmp = req_isp->fence_map_out[i].sync_id;
CAM_ERR_RATE_LIMIT(CAM_ISP,
@@ -4834,7 +4834,7 @@ static int __cam_isp_ctx_stop_dev_in_activated_unlock(
if (req_isp->fence_map_out[i].sync_id != -1) {
cam_sync_signal(
req_isp->fence_map_out[i].sync_id,
CAM_SYNC_STATE_SIGNALED_ERROR);
CAM_SYNC_STATE_SIGNALED_CANCEL);
}
list_add_tail(&req->list, &ctx->free_req_list);
}
@@ -4850,7 +4850,7 @@ static int __cam_isp_ctx_stop_dev_in_activated_unlock(
if (req_isp->fence_map_out[i].sync_id != -1) {
cam_sync_signal(
req_isp->fence_map_out[i].sync_id,
CAM_SYNC_STATE_SIGNALED_ERROR);
CAM_SYNC_STATE_SIGNALED_CANCEL);
}
list_add_tail(&req->list, &ctx->free_req_list);
}
@@ -4866,7 +4866,7 @@ static int __cam_isp_ctx_stop_dev_in_activated_unlock(
if (req_isp->fence_map_out[i].sync_id != -1) {
cam_sync_signal(
req_isp->fence_map_out[i].sync_id,
CAM_SYNC_STATE_SIGNALED_ERROR);
CAM_SYNC_STATE_SIGNALED_CANCEL);
}
list_add_tail(&req->list, &ctx->free_req_list);
}