Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1157d339 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Fix KW issues"

parents 72d2a8af ba934d0b

drivers/media/platform/msm/camera/cam_core/cam_context_utils.c

+2 −2
Original line number Diff line number Diff line
@@ -1053,8 +1053,8 @@ static int cam_context_dump_context(struct cam_context *ctx, 
	struct cam_context_dump_header *hdr;

	char *dst;

	uint64_t *addr, *start;

	uintptr_t cpu_addr;

	size_t    buf_len;

	uintptr_t cpu_addr = 0;

	size_t    buf_len = 0;

	uint32_t min_len, remain_len;

	struct cam_ctx_request *req;

	int i;

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1579,6 +1579,7 @@ static int cam_fd_mgr_hw_dump(void *hw_mgr_priv, 
		frame_req->submit_timestamp.tv_usec,

		cur_time.tv_sec,

		cur_time.tv_usec);

	memset(&fd_dump_args, 0, sizeof(fd_dump_args));

	rc  = cam_mem_get_cpu_buf(dump_args->buf_handle,

		&fd_dump_args.cpu_addr, &fd_dump_args.buf_len);

	if (!fd_dump_args.cpu_addr || !fd_dump_args.buf_len || rc) {

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+1 −0
Original line number Diff line number Diff line
@@ -4611,6 +4611,7 @@ static int cam_icp_mgr_hw_dump(void *hw_priv, void *hw_dump_args) 
		frm_process->submit_timestamp[i].tv_usec,

		cur_time.tv_sec,

		cur_time.tv_usec);

	memset(&icp_dump_args, 0, sizeof(icp_dump_args));

	rc  = cam_mem_get_cpu_buf(dump_args->buf_handle,

		&icp_dump_args.cpu_addr, &icp_dump_args.buf_len);

	if (!icp_dump_args.cpu_addr || !icp_dump_args.buf_len || rc) {

drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c

+4 −3
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ static int __cam_isp_ctx_reg_upd_in_activated_state( 
	list_del_init(&req->list);



	req_isp = (struct cam_isp_ctx_req *) req->req_priv;

	if (req_isp->num_fence_map_out != 0) {

	if (req_isp && req_isp->num_fence_map_out != 0) {

		list_add_tail(&req->list, &ctx->active_req_list);

		ctx_isp->active_req_cnt++;

		CAM_DBG(CAM_REQ,
@@ -1885,7 +1885,7 @@ static int __cam_isp_ctx_fs2_reg_upd_in_applied_state( 
	list_del_init(&req->list);



	req_isp = (struct cam_isp_ctx_req *) req->req_priv;

	if (req_isp->num_fence_map_out != 0) {

	if (req_isp && req_isp->num_fence_map_out != 0) {

		list_add_tail(&req->list, &ctx->active_req_list);

		ctx_isp->active_req_cnt++;

		CAM_DBG(CAM_REQ, "move request %lld to active list(cnt = %d)",
@@ -1903,7 +1903,7 @@ static int __cam_isp_ctx_fs2_reg_upd_in_applied_state( 
	 * state so change substate here.

	 */

	ctx_isp->substate_activated = CAM_ISP_CTX_ACTIVATED_EPOCH;

	if (req_isp->num_fence_map_out != 1)

	if (req_isp && req_isp->num_fence_map_out != 1)

		goto end;



	if (ctx->ctx_crm_intf && ctx->ctx_crm_intf->notify_trigger &&
@@ -2343,6 +2343,7 @@ static int __cam_isp_ctx_dump_in_top_state(struct cam_context *ctx, 
			is_dump_only_event_record = true;

		}

		ctx_isp = (struct cam_isp_context *) ctx->ctx_priv;

		memset(&cpu_addr, 0, sizeof(cpu_addr));

		rc  = cam_mem_get_cpu_buf(dump_info->buf_handle,

			&cpu_addr, &buf_len);

		if (!cpu_addr || !buf_len || rc) {

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+1 −0
Original line number Diff line number Diff line
@@ -4664,6 +4664,7 @@ static int cam_ife_mgr_dump(void *hw_mgr_priv, void *args) 
	int i;

	int rc = 0;



	memset(&isp_hw_dump_args, 0, sizeof(isp_hw_dump_args));

	rc  = cam_mem_get_cpu_buf(dump_args->buf_handle,

		&isp_hw_dump_args.cpu_addr,

		&isp_hw_dump_args.buf_len);