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

Commit a83de8a7 authored by E V Ravi's avatar E V Ravi Committed by Gerrit - the friendly Code Review server
Browse files

msm: ais: Mapping IFE selection with userspace 



Enabling the ability to select IFE in userspace

Change-Id: Icc15e28abf99752e4bfdbbffdd09313b8e99aa33
Signed-off-by: default avatarE V Ravi <evenka@codeaurora.org>
parent 16103565

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

+28 −44
Original line number Diff line number Diff line
@@ -1243,6 +1243,7 @@ static int cam_ife_mgr_acquire_cid_res( 
	struct cam_csid_hw_reserve_resource_args  csid_acquire;

	uint32_t acquired_cnt = 0;

	struct cam_isp_out_port_info        *out_port = NULL;

	uint32_t ife_id = 0;



	ife_hw_mgr = ife_ctx->hw_mgr;

	*cid_res = NULL;
@@ -1263,6 +1264,11 @@ static int cam_ife_mgr_acquire_cid_res( 
	if (in_port->num_out_res)

		out_port = &(in_port->data[0]);



	if (!out_port) {

		CAM_ERR(CAM_ISP, "No info of out_port to be Acquired");

		goto end;

	}



	/* Try acquiring CID resource from previously acquired HW */

	list_for_each_entry(cid_res_iterator, &ife_ctx->res_list_ife_cid,

		list) {
@@ -1315,57 +1321,35 @@ static int cam_ife_mgr_acquire_cid_res( 
		}

	}



	/* Acquire Left if not already acquired */

	if (ife_ctx->is_fe_enable) {

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

			if (!ife_hw_mgr->csid_devices[i])

				continue;

	/* Acquire Left if not already acquired

	 * Using reserved field to receive ifeId from UMD and Acquiring

	 * corresponding IFE resource only if available

	 */

	ife_id = out_port->reserved;



			hw_intf = ife_hw_mgr->csid_devices[i];

			rc = hw_intf->hw_ops.reserve(hw_intf->hw_priv,

				&csid_acquire, sizeof(csid_acquire));

			if (rc)

				continue;

			else {

				cid_res_temp->hw_res[acquired_cnt++] =

					csid_acquire.node_res;

				break;

			}

		}

		if (i == CAM_IFE_CSID_HW_NUM_MAX || !csid_acquire.node_res) {

	if ((ife_id >= CAM_IFE_CSID_HW_NUM_MAX) ||

		(!ife_hw_mgr->csid_devices[ife_id])) {

		CAM_ERR(CAM_ISP,

				"Can not acquire ife cid resource for path %d",

				path_res_id);

			"cannot acquire ife cid resource for path %d hw_idx %d",

			path_res_id, ife_id);

		goto put_res;

		}

	} else {

		for (i = CAM_IFE_CSID_HW_NUM_MAX - 1; i >= 0; i--) {

			if (!ife_hw_mgr->csid_devices[i])

				continue;



			hw_intf = ife_hw_mgr->csid_devices[i];

		hw_intf = ife_hw_mgr->csid_devices[ife_id];

		rc = hw_intf->hw_ops.reserve(hw_intf->hw_priv,

			&csid_acquire, sizeof(csid_acquire));

			if (rc)

				continue;

			else {

				cid_res_temp->hw_res[acquired_cnt++] =

					csid_acquire.node_res;

				break;

			}

		}

		if (i == -1 || !csid_acquire.node_res) {

		if (rc || !csid_acquire.node_res) {

			CAM_ERR(CAM_ISP,

				"Can not acquire ife cid resource for path %d",

				path_res_id);

				"cannot acquire ife cid resource for path %d hw_idx %d",

				path_res_id, ife_id);

			goto put_res;

		} else {

			cid_res_temp->hw_res[acquired_cnt++] =

				csid_acquire.node_res;

		}

	}





acquire_successful:

	CAM_DBG(CAM_ISP, "CID left acquired success is_dual %d",

		in_port->usage_type);

	CAM_DBG(CAM_ISP, "CID left acquired success is_dual %d for hw_idx %d",

		in_port->usage_type, ife_id);



	cid_res_temp->res_type = CAM_IFE_HW_MGR_RES_CID;

	/* CID(DT_ID) value of acquire device, require for path */

drivers/media/platform/msm/ais/cam_isp/isp_hw_mgr/isp_hw/include/cam_isp_hw.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <uapi/media/cam_isp.h>

#include "cam_soc_util.h"

#include "cam_irq_controller.h"

#include <uapi/media/cam_isp.h>



/*

 * struct cam_isp_timestamp: