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

Commit 750e62a7 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Correct number of cores"

parents 62fc3d83 df2566a5

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
@@ -4276,7 +4276,7 @@ static int cam_ife_mgr_process_recovery_cb(void *priv, void *data) 


		CAM_DBG(CAM_ISP, "RESET: Calling VFE reset");



		for (i = 0; i < CAM_VFE_HW_NUM_MAX; i++) {

		for (i = 0; i < CAM_IFE_HW_NUM_MAX; i++) {

			if (recovery_data->affected_core[i])

				cam_ife_mgr_reset_vfe_hw(ife_hw_mgr, i);

		}

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_isp_hw_mgr.h

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

/*

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

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

 */



#ifndef _CAM_ISP_HW_MGR_H_
@@ -9,7 +9,7 @@ 
#include "cam_isp_hw_mgr_intf.h"

#include "cam_tasklet_util.h"



#define CAM_ISP_HW_NUM_MAX                       4

#define CAM_ISP_HW_NUM_MAX                       7



/**

 * struct cam_isp_hw_mgr_ctx - common acquired context for managers