samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

Merge "msm: camera: isp: Protect recovery callback from stop ioctl using mutex" into camera-kernel.lnx.5.0

Telusuri Sumber
This commit is contained in:
Savita Patted
2021-08-13 18:20:13 -07:00
committed by Gerrit - the friendly Code Review server
orang tua 9d61603734 b811f12335
melakukan 605c8a002d
6 mengubah file dengan 100 tambahan dan 12 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/cam_isp/cam_isp_context.c
Melihat File

@@ -33,6 +33,8 @@ static struct cam_isp_ctx_debug isp_ctx_debug;
static int cam_isp_context_dump_requests(void *data,
struct cam_smmu_pf_info *pf_info);
static int cam_isp_context_hw_recovery(void *priv, void *data);
static int __cam_isp_ctx_start_dev_in_ready(struct cam_context *ctx,
struct cam_start_stop_dev_cmd *cmd);
@@ -6530,9 +6532,23 @@ static struct cam_ctx_ops
.irq_ops = __cam_isp_ctx_handle_irq_in_activated,
.pagefault_ops = cam_isp_context_dump_requests,
.dumpinfo_ops = cam_isp_context_info_dump,
.recovery_ops = cam_isp_context_hw_recovery,
},
};
static int cam_isp_context_hw_recovery(void *priv, void *data)
{
struct cam_context *ctx = priv;
int rc = -EPERM;
if (ctx->hw_mgr_intf->hw_recovery)
rc = ctx->hw_mgr_intf->hw_recovery(ctx->hw_mgr_intf->hw_mgr_priv, data);
else
CAM_ERR(CAM_ISP, "hw mgr doesn't support recovery");
return rc;
}
static int cam_isp_context_dump_requests(void *data,
struct cam_smmu_pf_info *pf_info)
{