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

Commit c6bc9e50 authored by Venkat Chinta's avatar Venkat Chinta Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: isp: Add VFE Bus 2.0 support 



This change adds support for VFE Bus version 2.0 to the IFE
driver. This change includes new enum to support new output
port, new header to update hardware registers and info and
finally new source code to support the Bus 2.0 architecture.
Apart from register programming changes, source code changes
include not subscribing to individual WM done IRQs and always
acquiring composite groups as they are fixed in the hardware.

Change-Id: I3e29705a07aa5f1c861e26fb5a45597d0359742d
Signed-off-by: default avatarVenkat Chinta <vchinta@codeaurora.org>
Signed-off-by: default avatarJigarkumar Zala <jzala@codeaurora.org>
parent 4b8bf5e3

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

+1 −9
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.

 */



#include <linux/slab.h>
@@ -5147,14 +5147,6 @@ int cam_ife_mgr_do_tasklet_buf_done(void *handler_priv, 
		evt_payload, evt_payload->core_index);

	CAM_DBG(CAM_ISP, "bus_irq_status_0: = %x", evt_payload->irq_reg_val[0]);

	CAM_DBG(CAM_ISP, "bus_irq_status_1: = %x", evt_payload->irq_reg_val[1]);

	CAM_DBG(CAM_ISP, "bus_irq_status_2: = %x", evt_payload->irq_reg_val[2]);

	CAM_DBG(CAM_ISP, "bus_irq_comp_err: = %x", evt_payload->irq_reg_val[3]);

	CAM_DBG(CAM_ISP, "bus_irq_comp_owrt: = %x",

		evt_payload->irq_reg_val[4]);

	CAM_DBG(CAM_ISP, "bus_irq_dual_comp_err: = %x",

		evt_payload->irq_reg_val[5]);

	CAM_DBG(CAM_ISP, "bus_irq_dual_comp_owrt: = %x",

		evt_payload->irq_reg_val[6]);

	/* WM Done */

	return cam_ife_hw_mgr_handle_buf_done_for_hw_res(ife_hwr_mgr_ctx,

		evt_payload_priv);

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/include/cam_vfe_hw_intf.h

+11 −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_VFE_HW_INTF_H_
@@ -67,6 +67,12 @@ enum cam_vfe_bus_irq_regs { 
	CAM_IFE_BUS_IRQ_REGISTERS_MAX,

};



enum cam_vfe_bus_ver3_irq_regs {

	CAM_IFE_IRQ_BUS_VER3_REG_STATUS0             = 0,

	CAM_IFE_IRQ_BUS_VER3_REG_STATUS1             = 1,

	CAM_IFE_IRQ_BUS_VER3_REG_MAX,

};



enum cam_vfe_reset_type {

	CAM_VFE_HW_RESET_HW_AND_REG,

	CAM_VFE_HW_RESET_HW,
@@ -257,8 +263,11 @@ struct cam_vfe_bus_irq_evt_payload { 
	struct list_head            list;

	uint32_t                    core_index;

	uint32_t                    debug_status_0;

	uint32_t                    ccif_violation_status;

	uint32_t                    overflow_status;

	uint32_t                    image_size_violation_status;

	uint32_t                    evt_id;

	uint32_t                    irq_reg_val[CAM_IFE_BUS_IRQ_REGISTERS_MAX];

	uint32_t                    irq_reg_val[CAM_IFE_IRQ_BUS_VER3_REG_MAX];

	uint32_t                    error_type;

	struct cam_isp_timestamp    ts;

	void                       *ctx;

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe17x.c

+6 −1
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.

 */



#include <linux/module.h>

#include "cam_vfe170.h"

#include "cam_vfe175.h"

#include "cam_vfe175_130.h"

#include "cam_vfe480.h"

#include "cam_vfe_lite17x.h"

#include "cam_vfe_hw_intf.h"

#include "cam_vfe_core.h"
@@ -25,6 +26,10 @@ static const struct of_device_id cam_vfe_dt_match[] = { 
		.compatible = "qcom,vfe175_130",

		.data = &cam_vfe175_130_hw_info,

	},

	{

		.compatible = "qcom,vfe480",

		.data = &cam_vfe480_hw_info,

	},

	{

		.compatible = "qcom,vfe-lite170",

		.data = &cam_vfe_lite17x_hw_info,

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe480.h

0 → 100644
+974 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,4 +13,4 @@ ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_h 
ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/include

ccflags-y += -Idrivers/media/platform/msm/camera/cam_cpas/include



obj-$(CONFIG_SPECTRA_CAMERA) += cam_vfe_bus.o cam_vfe_bus_ver2.o cam_vfe_bus_rd_ver1.o
 
obj-$(CONFIG_SPECTRA_CAMERA) += cam_vfe_bus.o cam_vfe_bus_ver2.o cam_vfe_bus_rd_ver1.o cam_vfe_bus_ver3.o