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

Commit 4e1c57a3 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: reqmgr: Create workq based on driver requirement" into dev/msm-4.9-camx

parents a867e968 d114a207

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

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

/* Copyright (c) 2017-2018, 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
@@ -1884,7 +1884,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);

		&g_fd_hw_mgr.work, CRM_WORKQ_USAGE_IRQ, 0);

	if (rc) {

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

		goto detach_smmu;

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

+4 −3
Original line number Diff line number Diff line
@@ -4240,21 +4240,22 @@ 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);

		&icp_hw_mgr.cmd_work, CRM_WORKQ_USAGE_NON_IRQ,

		0);

	if (rc) {

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

		goto cmd_work_failed;

	}



	rc = cam_req_mgr_workq_create("icp_message_queue", ICP_WORKQ_NUM_TASK,

		&icp_hw_mgr.msg_work, CRM_WORKQ_USAGE_IRQ);

		&icp_hw_mgr.msg_work, CRM_WORKQ_USAGE_IRQ, 0);

	if (rc) {

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

		goto msg_work_failed;

	}



	rc = cam_req_mgr_workq_create("icp_timer_queue", ICP_WORKQ_NUM_TASK,

		&icp_hw_mgr.timer_work, CRM_WORKQ_USAGE_IRQ);

		&icp_hw_mgr.timer_work, CRM_WORKQ_USAGE_IRQ, 0);

	if (rc) {

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

		goto timer_work_failed;

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

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


	/* 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);

			&g_ife_hw_mgr.workq, CRM_WORKQ_USAGE_NON_IRQ, 0);

	if (rc < 0) {

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

		goto end;

drivers/media/platform/msm/camera/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c

+2 −2
Original line number Diff line number Diff line
@@ -1171,7 +1171,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);

		CRM_WORKQ_USAGE_NON_IRQ, 0);

	if (rc) {

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

		goto work_process_frame_failed;
@@ -1181,7 +1181,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);

		CRM_WORKQ_USAGE_IRQ, 0);

	if (rc) {

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

		goto work_process_irq_cb_failed;

drivers/media/platform/msm/camera/cam_lrme/lrme_hw_mgr/cam_lrme_hw_mgr.c

+2 −1
Original line number Diff line number Diff line
@@ -989,7 +989,8 @@ int cam_lrme_mgr_register_device( 
	CAM_DBG(CAM_LRME, "Create submit workq for %s", buf);

	rc = cam_req_mgr_workq_create(buf,

		CAM_LRME_WORKQ_NUM_TASK,

		&hw_device->work, CRM_WORKQ_USAGE_NON_IRQ);

		&hw_device->work, CRM_WORKQ_USAGE_NON_IRQ,

		0);

	if (rc) {

		CAM_ERR(CAM_LRME,

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