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

msm: camera: common: Merge camera-kernel.3.1 changes in camera-kernel.4.0

Browse Source 
msm: camera: cdm: Fix dangling pointer issue
msm: camera: cdm: change work record to atomic variable
msm: camera: utils: Adding device type to track device handles
msm: camera: tfe: Reduce stack footprint during bw vote
msm: camera: req_mgr: Thread switch delay detection mechanisms
msm: camera: cdm: Avoid submitting BL if FIFO is full
msm: camera: tfe: check cdm hang in the tfe config timeout
msm: camera: req_mgr: Delay detection mechanism
msm: camera: cdm: Debug info in case of cdm page fault
msm: camera: isp: Max context reduction for TFE in isp driver
msm: camera: ope: Maintain current clock value during acquire
msm: camera: req_mgr: Limit CAM_ERR log in case of no empty task
msm: camera: cdm: Decrement write-count only after Bl commit
msm: camera: isp: Added CSID recovery mechanism.

CRs-Fixed: 2792394
Change-Id: I1c7a903ae15b572acf3f6318cda7394cb6549c8d
Signed-off-by: Tejas Prajapati <tpraja@codeaurora.org>
This commit is contained in:
Tejas Prajapati
2020-10-07 12:54:08 +05:30
parent fabd1f7b0a
commit 4574450a12
46 changed files with 1134 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/cam_isp/cam_isp_context.c
View File

@@ -19,6 +19,7 @@
#include "cam_cdm_util.h"
#include "cam_isp_context.h"
#include "cam_common_util.h"
#include "cam_req_mgr_debug.h"
static const char isp_dev_name[] = "cam-isp";
@@ -1832,6 +1833,12 @@ static int __cam_isp_ctx_epoch_in_applied(struct cam_isp_context *ctx_isp,
CAM_DBG(CAM_ISP, "next Substate[%s]",
__cam_isp_ctx_substate_val_to_type(
ctx_isp->substate_activated));
cam_req_mgr_debug_delay_detect();
trace_cam_delay_detect("ISP",
"bubble epoch_in_applied", req->request_id,
ctx->ctx_id, ctx->link_hdl, ctx->session_hdl,
CAM_DEFAULT_VALUE);
end:
if (request_id == 0) {
req = list_last_entry(&ctx->active_req_list,
@@ -2048,6 +2055,13 @@ static int __cam_isp_ctx_epoch_in_bubble_applied(
CAM_DBG(CAM_ISP, "next Substate[%s]",
__cam_isp_ctx_substate_val_to_type(
ctx_isp->substate_activated));
cam_req_mgr_debug_delay_detect();
trace_cam_delay_detect("ISP",
"bubble epoch_in_bubble_applied",
req->request_id, ctx->ctx_id,
ctx->link_hdl, ctx->session_hdl,
CAM_DEFAULT_VALUE);
end:
req = list_last_entry(&ctx->active_req_list, struct cam_ctx_request,
list);
@@ -4223,6 +4237,7 @@ static int __cam_isp_ctx_config_dev_in_top_state(
req_isp->num_fence_map_in = cfg.num_in_map_entries;
req_isp->num_acked = 0;
req_isp->bubble_detected = false;
req_isp->hw_update_data.packet = packet;
for (i = 0; i < req_isp->num_fence_map_out; i++) {
rc = cam_sync_get_obj_ref(req_isp->fence_map_out[i].sync_id);
@@ -4444,7 +4459,7 @@ get_dev_handle:
req_hdl_param.media_entity_flag = 0;
req_hdl_param.ops = ctx->crm_ctx_intf;
req_hdl_param.priv = ctx;
req_hdl_param.dev_id = CAM_ISP;
CAM_DBG(CAM_ISP, "get device handle form bridge");
ctx->dev_hdl = cam_create_device_hdl(&req_hdl_param);
if (ctx->dev_hdl <= 0) {