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

Commit 49240a41 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: req_mgr: Add support for static payload in workqueue" into... 

Merge "msm: camera: req_mgr: Add support for static payload in workqueue" into camera-kernel.lnx.1.0
parents f335f4e3 adc649ed

drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -2086,7 +2086,7 @@ int cam_fd_hw_mgr_init(struct device_node *of_node, 
	}



	rc = cam_req_mgr_workq_create("cam_fd_worker", CAM_FD_WORKQ_NUM_TASK,

		&g_fd_hw_mgr.work, CRM_WORKQ_USAGE_IRQ, 0,

		&g_fd_hw_mgr.work, CRM_WORKQ_USAGE_IRQ, 0, true,

		cam_req_mgr_process_workq_cam_fd_worker);

	if (rc) {

		CAM_ERR(CAM_FD, "Unable to create a worker, rc=%d", rc);

drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+3 −3
Original line number Diff line number Diff line
@@ -5995,7 +5995,7 @@ static int cam_icp_mgr_create_wq(void) 
	int i;



	rc = cam_req_mgr_workq_create("icp_command_queue", ICP_WORKQ_NUM_TASK,

		&icp_hw_mgr.cmd_work, CRM_WORKQ_USAGE_NON_IRQ, 0,

		&icp_hw_mgr.cmd_work, CRM_WORKQ_USAGE_NON_IRQ, 0, false,

		cam_req_mgr_process_workq_icp_command_queue);

	if (rc) {

		CAM_ERR(CAM_ICP, "unable to create a command worker");
@@ -6003,7 +6003,7 @@ static int cam_icp_mgr_create_wq(void) 
	}



	rc = cam_req_mgr_workq_create("icp_message_queue", ICP_WORKQ_NUM_TASK,

		&icp_hw_mgr.msg_work, CRM_WORKQ_USAGE_IRQ, 0,

		&icp_hw_mgr.msg_work, CRM_WORKQ_USAGE_IRQ, 0, false,

		cam_req_mgr_process_workq_icp_message_queue);

	if (rc) {

		CAM_ERR(CAM_ICP, "unable to create a message worker");
@@ -6011,7 +6011,7 @@ static int cam_icp_mgr_create_wq(void) 
	}



	rc = cam_req_mgr_workq_create("icp_timer_queue", ICP_WORKQ_NUM_TASK,

		&icp_hw_mgr.timer_work, CRM_WORKQ_USAGE_IRQ, 0,

		&icp_hw_mgr.timer_work, CRM_WORKQ_USAGE_IRQ, 0, false,

		cam_req_mgr_process_workq_icp_timer_queue);

	if (rc) {

		CAM_ERR(CAM_ICP, "unable to create a timer worker");

drivers/cam_isp/cam_isp_context.c

+1 −1
Original line number Diff line number Diff line
@@ -4354,7 +4354,7 @@ static int __cam_isp_ctx_acquire_hw_v2(struct cam_context *ctx, 
		ctx_isp->offline_context = true;



		rc = cam_req_mgr_workq_create("offline_ife", 20,

			&ctx_isp->workq, CRM_WORKQ_USAGE_IRQ, 0,

			&ctx_isp->workq, CRM_WORKQ_USAGE_IRQ, 0, false,

			cam_req_mgr_process_workq_offline_ife_worker);

		if (rc)

			CAM_ERR(CAM_ISP,

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -7870,7 +7870,7 @@ int cam_ife_hw_mgr_init(struct cam_hw_mgr_intf *hw_mgr_intf, int *iommu_hdl) 


	/* Create Worker for ife_hw_mgr with 10 tasks */

	rc = cam_req_mgr_workq_create("cam_ife_worker", 10,

			&g_ife_hw_mgr.workq, CRM_WORKQ_USAGE_NON_IRQ, 0,

			&g_ife_hw_mgr.workq, CRM_WORKQ_USAGE_NON_IRQ, 0, false,

			cam_req_mgr_process_workq_cam_ife_worker);

	if (rc < 0) {

		CAM_ERR(CAM_ISP, "Unable to create worker");

drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c

+2 −2
Original line number Diff line number Diff line
@@ -1303,7 +1303,7 @@ static int cam_jpeg_setup_workqs(void) 
		"jpeg_command_queue",

		CAM_JPEG_WORKQ_NUM_TASK,

		&g_jpeg_hw_mgr.work_process_frame,

		CRM_WORKQ_USAGE_NON_IRQ, 0,

		CRM_WORKQ_USAGE_NON_IRQ, 0, false,

		cam_req_mgr_process_workq_jpeg_command_queue);

	if (rc) {

		CAM_ERR(CAM_JPEG, "unable to create a worker %d", rc);
@@ -1314,7 +1314,7 @@ static int cam_jpeg_setup_workqs(void) 
		"jpeg_message_queue",

		CAM_JPEG_WORKQ_NUM_TASK,

		&g_jpeg_hw_mgr.work_process_irq_cb,

		CRM_WORKQ_USAGE_IRQ, 0,

		CRM_WORKQ_USAGE_IRQ, 0, false,

		cam_req_mgr_process_workq_jpeg_message_queue);

	if (rc) {

		CAM_ERR(CAM_JPEG, "unable to create a worker %d", rc);