Merge 2d0bdfe4ebe2bc04b09804dedd895389c5951876 on remote branch (ced4ca2e) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c

+4 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
		*/

		#include <linux/module.h>
		@@ -53,7 +54,9 @@ static int cam_fd_mgr_util_packet_validate(struct cam_packet *packet,
		}

		/* All buffers must come through io config, do not support patching */
		if (packet->num_patches \|\| !packet->num_io_configs) {
		if (packet->num_patches \|\|
		!packet->num_io_configs \|\|
		!packet->num_cmd_buf) {
		CAM_ERR(CAM_FD, "wrong number of cmd/patch info: %u %u",
		packet->num_cmd_buf, packet->num_patches);
		return -EINVAL;

drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -4215,13 +4215,15 @@ static int cam_icp_mgr_pkt_validation(struct cam_packet *packet)
		return -EINVAL;
		}

		if (packet->num_io_configs > IPE_IO_IMAGES_MAX) {
		if (!packet->num_io_configs \|\|
		packet->num_io_configs > IPE_IO_IMAGES_MAX) {
		CAM_ERR(CAM_ICP, "Invalid number of io configs: %d %d",
		IPE_IO_IMAGES_MAX, packet->num_io_configs);
		return -EINVAL;
		}

		if (packet->num_cmd_buf > CAM_ICP_CTX_MAX_CMD_BUFFERS) {
		if (!packet->num_cmd_buf \|\|
		packet->num_cmd_buf > CAM_ICP_CTX_MAX_CMD_BUFFERS) {
		CAM_ERR(CAM_ICP, "Invalid number of cmd buffers: %d %d",
		CAM_ICP_CTX_MAX_CMD_BUFFERS, packet->num_cmd_buf);
		return -EINVAL;

drivers/cam_isp/cam_isp_context.c

+65 −2

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
		* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
		* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
		*/

		#include <linux/debugfs.h>
		@@ -3843,6 +3843,69 @@ static int __cam_isp_ctx_rdi_only_reg_upd_in_bubble_applied_state(
		return 0;
		}

		static int __cam_isp_ctx_rdi_only_reg_upd_in_applied_state(
		struct cam_isp_context ctx_isp, void evt_data)
		{
		struct cam_ctx_request *req = NULL;
		struct cam_context *ctx = ctx_isp->base;
		struct cam_isp_ctx_req *req_isp;
		uint64_t request_id = 0;

		if (list_empty(&ctx->wait_req_list)) {
		CAM_ERR_RATE_LIMIT(CAM_ISP,
		"Reg upd ack with no waiting req ctx %u active cnt %d",
		ctx->ctx_id, ctx_isp->active_req_cnt);

		/* move the sub state machine to SOF sub state */
		ctx_isp->substate_activated = CAM_ISP_CTX_ACTIVATED_SOF;
		goto end;
		}

		ctx_isp->substate_activated = CAM_ISP_CTX_ACTIVATED_EPOCH;

		req = list_first_entry(&ctx->wait_req_list,
		struct cam_ctx_request, list);
		list_del_init(&req->list);

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

		request_id = (req_isp->hw_update_data.packet_opcode_type ==
		CAM_ISP_PACKET_INIT_DEV) ? 0 : req->request_id;

		if (req_isp->num_fence_map_out != 0) {
		list_add_tail(&req->list, &ctx->active_req_list);
		ctx_isp->active_req_cnt++;
		request_id = req->request_id;
		CAM_DBG(CAM_REQ,
		"move request %lld to active list(cnt = %d), ctx %u",
		req->request_id, ctx_isp->active_req_cnt, ctx->ctx_id);
		} else {
		/* no io config, so the request is completed. */
		list_add_tail(&req->list, &ctx->free_req_list);
		CAM_DBG(CAM_ISP,
		"move active req %lld to free list(cnt = %d), ctx %u",
		req->request_id, ctx_isp->active_req_cnt, ctx->ctx_id);
		}

		if (request_id) {
		ctx_isp->reported_req_id = request_id;
		__cam_isp_ctx_send_sof_timestamp(ctx_isp, request_id,
		CAM_REQ_MGR_SOF_EVENT_SUCCESS);
		}

		CAM_DBG(CAM_ISP, "next Substate[%s] ctx %u",
		__cam_isp_ctx_substate_val_to_type(ctx_isp->substate_activated),
		ctx->ctx_id);

		__cam_isp_ctx_update_event_record(ctx_isp, CAM_ISP_CTX_EVENT_RUP, req);

		return 0;
		end:
		__cam_isp_ctx_update_event_record(ctx_isp, CAM_ISP_CTX_EVENT_RUP, NULL);

		return 0;
		}

		static struct cam_isp_ctx_irq_ops
		cam_isp_ctx_rdi_only_activated_state_machine_irq
		[CAM_ISP_CTX_ACTIVATED_MAX] = {
		@@ -3862,7 +3925,7 @@ static struct cam_isp_ctx_irq_ops
		.irq_ops = {
		__cam_isp_ctx_handle_error,
		__cam_isp_ctx_rdi_only_sof_in_applied_state,
		NULL,
		__cam_isp_ctx_rdi_only_reg_upd_in_applied_state,
		NULL,
		NULL,
		__cam_isp_ctx_buf_done_in_applied,

drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c

+4 −2

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
		* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
		*/

		#include <linux/uaccess.h>
		@@ -727,8 +728,9 @@ static int cam_jpeg_mgr_prepare_hw_update(void *hw_mgr_priv,
		return rc;
		}

		if ((packet->num_cmd_buf > 5) \|\| !packet->num_patches \|\|
		!packet->num_io_configs \|\|
		if (!packet->num_cmd_buf \|\|
		(packet->num_cmd_buf > 5) \|\|
		!packet->num_patches \|\| !packet->num_io_configs \|\|
		(packet->num_io_configs > CAM_JPEG_IMAGE_MAX)) {
		CAM_ERR(CAM_JPEG,
		"wrong number of cmd/patch/io_configs info: %u %u %u",

drivers/cam_lrme/lrme_hw_mgr/cam_lrme_hw_mgr.c

+6 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
		*/

		#include <linux/module.h>
		@@ -112,6 +113,11 @@ static int cam_lrme_mgr_util_packet_validate(struct cam_packet *packet,
		return -EINVAL;
		}

		if (!packet->num_cmd_buf) {
		CAM_ERR(CAM_LRME, "no cmd bufs");
		return -EINVAL;
		}

		cmd_desc = (struct cam_cmd_buf_desc )((uint8_t )&packet->payload +
		packet->cmd_buf_offset);