Merge "msm: ais: identify the ife lite" (8abb67bb) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/ais/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe170.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,7 @@ static struct cam_vfe_bus_ver2_hw_info vfe170_bus_hw_info = {
		.debug_status_0 = 0x00002270,
		},
		.num_client = 20,
		.is_lite = 0,
		.bus_client_reg = {
		/* BUS Client 0 */
		{

+1 −0

Original line number	Diff line number	Diff line
		@@ -309,6 +309,7 @@ static struct cam_vfe_bus_ver2_hw_info vfe175_bus_hw_info = {
		.debug_status_0 = 0x00002270,
		},
		.num_client = 24,
		.is_lite = 0,
		.bus_client_reg = {
		/* BUS Client 0 */
		{

+1 −0

Original line number	Diff line number	Diff line
		@@ -410,6 +410,7 @@ static struct cam_vfe_bus_ver2_hw_info vfe175_130_bus_hw_info = {
		.addr_sync_no_sync = 0x00002084,
		},
		.num_client = 24,
		.is_lite = 0,
		.bus_client_reg = {
		/* BUS Client 0 */
		{

+2 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2018-2019, 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
		@@ -153,6 +153,7 @@ static struct cam_vfe_bus_ver2_hw_info vfe17x_bus_hw_info = {
		.addr_sync_no_sync = 0x00002084,
		},
		.num_client = 4,
		.is_lite = 1,
		.bus_client_reg = {
		/* BUS Client 0 */
		{

+4 −1

Original line number	Diff line number	Diff line
		@@ -199,6 +199,7 @@ struct cam_vfe_bus_ver2_priv {
		struct cam_vfe_bus_ver2_common_data common_data;
		uint32_t num_client;
		uint32_t num_out;
		uint32_t is_lite;

		struct cam_isp_resource_node bus_client[CAM_VFE_BUS_VER2_MAX_CLIENTS];
		struct cam_isp_resource_node comp_grp[CAM_VFE_BUS_VER2_COMP_GRP_MAX];
		@@ -922,7 +923,8 @@ static int cam_vfe_bus_acquire_wm(
		CAM_DBG(CAM_ISP, "WM %d width %d height %d", rsrc_data->index,
		rsrc_data->width, rsrc_data->height);

		if (rsrc_data->index < 3) {
		if (rsrc_data->index < 3 \|\|
		(ver2_bus_priv->is_lite && rsrc_data->index == 3)) {
		/* Write master 0-2 refers to RDI 0/ RDI 1/RDI 2 */
		if ((out_port_info->reserved >> 8) & 0x01) {
		/* frame based mode as default */
		@@ -3420,6 +3422,7 @@ int cam_vfe_bus_ver2_init(

		bus_priv->num_client = ver2_hw_info->num_client;
		bus_priv->num_out = ver2_hw_info->num_out;
		bus_priv->is_lite = ver2_hw_info->is_lite;
		bus_priv->common_data.num_sec_out = 0;
		bus_priv->common_data.secure_mode = CAM_SECURE_MODE_NON_SECURE;
		bus_priv->common_data.core_index = soc_info->index;