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

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

Merge "msm: camera: isp: Increase default SOF freeze timeout" into camera-kernel.lnx.3.1

parents 04fe354e 9167e96b

drivers/cam_req_mgr/cam_req_mgr_core.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

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

 */



#include <linux/module.h>
@@ -3788,7 +3788,7 @@ int cam_req_mgr_link_control(struct cam_req_mgr_link_control *control) 
		if (control->ops == CAM_REQ_MGR_LINK_ACTIVATE) {

			/* Start SOF watchdog timer */

			rc = crm_timer_init(&link->watchdog,

				CAM_REQ_MGR_WATCHDOG_TIMEOUT, link,

				CAM_REQ_MGR_WATCHDOG_TIMEOUT_DEFAULT, link,

				&__cam_req_mgr_sof_freeze);

			if (rc < 0) {

				CAM_ERR(CAM_CRM,

drivers/cam_req_mgr/cam_req_mgr_core.h

+6 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

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

 */

#ifndef _CAM_REQ_MGR_CORE_H_

#define _CAM_REQ_MGR_CORE_H_
@@ -14,6 +14,7 @@ 
#define MAX_REQ_SLOTS                  48



#define CAM_REQ_MGR_WATCHDOG_TIMEOUT          1000

#define CAM_REQ_MGR_WATCHDOG_TIMEOUT_DEFAULT  5000

#define CAM_REQ_MGR_WATCHDOG_TIMEOUT_MAX      50000

#define CAM_REQ_MGR_SCHED_REQ_TIMEOUT         1000

#define CAM_REQ_MGR_SIMULATE_SCHED_REQ        30