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

Merge "msm: camera: reqmgr: Change v4l2 notify error log type" into camera-kernel.lnx.1.0

Browse Source
This commit is contained in:
Camera Software Integration
2019-11-13 05:44:43 -08:00
committed by Gerrit - the friendly Code Review server
parent f45e3dda5c 7583d45a07
commit 4d054a6539
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/cam_req_mgr/cam_req_mgr_dev.c
View File

@@ -204,31 +204,39 @@ static void cam_v4l2_event_queue_notify_error(const struct v4l2_event *old,
ev_header = CAM_REQ_MGR_GET_PAYLOAD_PTR((*old), ev_header = CAM_REQ_MGR_GET_PAYLOAD_PTR((*old),
struct cam_req_mgr_message); struct cam_req_mgr_message);
switch (old->id) { switch (old->id) {
case V4L_EVENT_CAM_REQ_MGR_SOF: case V4L_EVENT_CAM_REQ_MGR_SOF:
CAM_ERR(CAM_CRM, "Failed to notify SOF event"); case V4L_EVENT_CAM_REQ_MGR_SOF_BOOT_TS:
CAM_ERR(CAM_CRM, "Sess %X FrameId %lld ReqId %lld link %X", if (ev_header->u.frame_msg.request_id)
ev_header->session_hdl, CAM_ERR(CAM_CRM,
ev_header->u.frame_msg.frame_id, "Failed to notify %s Sess %X FrameId %lld FrameMeta %d ReqId %lld link %X",
ev_header->u.frame_msg.request_id, ((old->id == V4L_EVENT_CAM_REQ_MGR_SOF) ?
ev_header->u.frame_msg.link_hdl); "SOF_TS" : "BOOT_TS"),
ev_header->session_hdl,
ev_header->u.frame_msg.frame_id,
ev_header->u.frame_msg.frame_id_meta,
ev_header->u.frame_msg.request_id,
ev_header->u.frame_msg.link_hdl);
else
CAM_WARN_RATE_LIMIT_CUSTOM(CAM_CRM, 5, 1,
"Failed to notify %s Sess %X FrameId %lld FrameMeta %d ReqId %lld link %X",
((old->id == V4L_EVENT_CAM_REQ_MGR_SOF) ?
"SOF_TS" : "BOOT_TS"),
ev_header->session_hdl,
ev_header->u.frame_msg.frame_id,
ev_header->u.frame_msg.frame_id_meta,
ev_header->u.frame_msg.request_id,
ev_header->u.frame_msg.link_hdl);
break; break;
case V4L_EVENT_CAM_REQ_MGR_ERROR: case V4L_EVENT_CAM_REQ_MGR_ERROR:
CAM_ERR(CAM_CRM, "Failed to notify ERROR"); CAM_ERR(CAM_CRM,
CAM_ERR(CAM_CRM, "Sess %X ReqId %d Link %X Type %d", "Failed to notify ERROR Sess %X ReqId %d Link %X Type %d",
ev_header->u.err_msg.error_type, ev_header->session_hdl,
ev_header->u.err_msg.request_id, ev_header->u.err_msg.request_id,
ev_header->u.err_msg.link_hdl, ev_header->u.err_msg.link_hdl,
ev_header->u.err_msg.error_type); ev_header->u.err_msg.error_type);
break; break;
case V4L_EVENT_CAM_REQ_MGR_SOF_BOOT_TS:
CAM_ERR(CAM_CRM, "Failed to notify BOOT_TS event");
CAM_ERR(CAM_CRM, "Sess %X FrameId %lld ReqId %lld link %X",
ev_header->session_hdl,
ev_header->u.frame_msg.frame_id,
ev_header->u.frame_msg.request_id,
ev_header->u.frame_msg.link_hdl);
break;
default: default:
CAM_ERR(CAM_CRM, "Failed to notify crm event id %d", CAM_ERR(CAM_CRM, "Failed to notify crm event id %d",
old->id); old->id);