samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Çatalla 0
Kod Konular Değişiklik İstekleri İşlemler Paketler Projeler Sürüm Wiki Aktivite

Merge "msm: camera: isp: VFE top remove unused values" into camera-kernel.lnx.5.0

Kaynağa Gözat
Bu işleme şunda yer alıyor:
Savita Patted
2021-03-29 18:35:08 -07:00
işlemeyi yapan: Gerrit - the friendly Code Review server
ebeveyn d09bc74fb6 89f09da4f2
işleme 0e1f0790e3
4 değiştirilmiş dosya ile 17 ekleme ve 157 silme
Yama Dosyasını İndir Diff Dosyasını İndir Tüm dosyaları genişlet Tüm dosyaları daralt

14
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_core.h
Dosyayı Görüntüle

@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
*/
#ifndef _CAM_VFE_CORE_H_
@@ -48,18 +48,6 @@ struct cam_vfe_hw_info {
uint32_t camif_lite_version;
void *camif_lite_reg;
uint32_t testgen_version;
void *testgen_reg;
uint32_t num_qos_settings;
struct cam_isp_reg_val_pair *qos_settings;
uint32_t num_ds_settings;
struct cam_isp_reg_val_pair *ds_settings;
uint32_t num_vbif_settings;
struct cam_isp_reg_val_pair *vbif_settings;
};
#define CAM_VFE_EVT_MAX 256

41
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe680.h
Dosyayı Görüntüle

@@ -541,14 +541,6 @@ static struct cam_vfe_ver4_path_reg_data vfe680_pdlib_reg_data = {
.top_debug_cfg_en = 3,
};
static struct cam_vfe_ver4_path_reg_data vfe680_lcr_reg_data = {
.sof_irq_mask = 0x100,
.eof_irq_mask = 0x200,
.error_irq_mask = 0x10000000,
.enable_diagnostic_hw = 0x1,
.top_debug_cfg_en = 3,
};
struct cam_vfe_ver4_path_hw_info
vfe680_rdi_hw_info_arr[CAM_VFE_RDI_VER2_MAX] = {
{
@@ -578,21 +570,16 @@ static struct cam_vfe_top_ver4_hw_info vfe680_top_hw_info = {
.rdi_hw_info[0] = &vfe680_rdi_hw_info_arr[0],
.rdi_hw_info[1] = &vfe680_rdi_hw_info_arr[1],
.rdi_hw_info[2] = &vfe680_rdi_hw_info_arr[2],
.lcr_hw_info = {
.common_reg = &vfe680_top_common_reg,
.reg_data = &vfe680_lcr_reg_data,
},
.wr_client_desc = vfe680_wr_client_desc,
.module_desc = vfe680_pp_mod_desc,
.camnoc_debug_data = &vfe680_camnoc_debug_data,
.num_mux = 6,
.num_mux = 5,
.mux_type = {
CAM_VFE_CAMIF_VER_4_0,
CAM_VFE_RDI_VER_1_0,
CAM_VFE_RDI_VER_1_0,
CAM_VFE_RDI_VER_1_0,
CAM_VFE_PDLIB_VER_1_0,
CAM_VFE_LCR_VER_1_0,
},
};
@@ -1493,7 +1480,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680_bus_hw_info = {
.ubwc_regs = NULL,
},
},
.num_out = 27,
.num_out = 25,
.vfe_out_hw_info = {
{
.vfe_out_type = CAM_VFE_BUS_VER3_VFE_OUT_RDI0,
@@ -1587,27 +1574,6 @@ static struct cam_vfe_bus_ver3_hw_info vfe680_bus_hw_info = {
20,
},
},
{
.vfe_out_type = CAM_VFE_BUS_VER3_VFE_OUT_STATS_HDR_BE,
.max_width = -1,
.max_height = -1,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_0,
.num_wm = 1,
.wm_idx = {
11,
},
},
{
.vfe_out_type =
CAM_VFE_BUS_VER3_VFE_OUT_STATS_HDR_BHIST,
.max_width = 1920,
.max_height = 1080,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_0,
.num_wm = 1,
.wm_idx = {
12,
},
},
{
.vfe_out_type =
CAM_VFE_BUS_VER3_VFE_OUT_STATS_TL_BG,
@@ -1792,9 +1758,6 @@ static struct cam_vfe_hw_info cam_vfe680_hw_info = {
.bus_version = CAM_VFE_BUS_VER_3_0,
.bus_hw_info = &vfe680_bus_hw_info,
.bus_rd_version = CAM_VFE_BUS_RD_VER_1_0,
.bus_rd_hw_info = &vfe480_bus_rd_hw_info,
.top_version = CAM_VFE_TOP_VER_4_0,
.top_hw_info = &vfe680_top_hw_info,
};

60
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_top_ver4.c
Dosyayı Görüntüle

@@ -17,14 +17,9 @@
#include "cam_tasklet_util.h"
#include "cam_cdm_intf_api.h"
#define CAM_VFE_HW_RESET_HW_AND_REG_VAL 0x00000001
#define CAM_VFE_HW_RESET_HW_VAL 0x00010000
#define CAM_VFE_LITE_HW_RESET_AND_REG_VAL 0x00000002
#define CAM_VFE_LITE_HW_RESET_HW_VAL 0x00000001
#define CAM_CDM_WAIT_COMP_EVENT_BIT 0x2
#define CAM_VFE_CAMIF_IRQ_SOF_DEBUG_CNT_MAX 2
#define CAM_VFE_LEN_LOG_BUF 256
#define CAM_SHIFT_TOP_CORE_VER_4_CFG_DSP_EN 8
#define CAM_VFE_CAMIF_IRQ_SOF_DEBUG_CNT_MAX 2
#define CAM_VFE_LEN_LOG_BUF 256
struct cam_vfe_top_ver4_common_data {
struct cam_hw_soc_info *soc_info;
@@ -1252,14 +1247,6 @@ int cam_vfe_top_ver4_reserve(void *device_priv,
break;
}
if (acquire_args->res_id == CAM_ISP_HW_VFE_IN_RD) {
rc = cam_vfe_fe_ver1_acquire_resource(
&top_priv->top_common.mux_rsrc[i],
args);
if (rc)
break;
}
top_priv->top_common.mux_rsrc[i].cdm_ops =
acquire_args->cdm_ops;
top_priv->top_common.mux_rsrc[i].tasklet_info =
@@ -2238,17 +2225,6 @@ int cam_vfe_top_ver4_init(
hw_info->rdi_hw_info[j++],
&top_priv->top_common.mux_rsrc[i],
vfe_irq_controller);
} else if (hw_info->mux_type[i] ==
CAM_VFE_LCR_VER_1_0) {
/* set the LCR resource id */
top_priv->top_common.mux_rsrc[i].res_id =
CAM_ISP_HW_VFE_IN_LCR;
rc = cam_vfe_res_mux_init(top_priv,
hw_intf, soc_info,
&hw_info->lcr_hw_info,
&top_priv->top_common.mux_rsrc[i],
vfe_irq_controller);
} else {
CAM_WARN(CAM_ISP, "Invalid mux type: %u",
hw_info->mux_type[i]);
@@ -2285,10 +2261,6 @@ deinit_resources:
if (cam_vfe_res_mux_deinit(
&top_priv->top_common.mux_rsrc[i]))
CAM_ERR(CAM_ISP, "Camif Deinit failed");
} else if (hw_info->mux_type[i] == CAM_VFE_IN_RD_VER_1_0) {
if (cam_vfe_fe_ver1_deinit(
&top_priv->top_common.mux_rsrc[i]))
CAM_ERR(CAM_ISP, "Camif fe Deinit failed");
} else {
if (cam_vfe_res_mux_deinit(
&top_priv->top_common.mux_rsrc[i]))
@@ -2337,29 +2309,9 @@ int cam_vfe_top_ver4_deinit(struct cam_vfe_top **vfe_top_ptr)
for (i = 0; i < top_priv->top_common.num_mux; i++) {
top_priv->top_common.mux_rsrc[i].res_state =
CAM_ISP_RESOURCE_STATE_UNAVAILABLE;
if (top_priv->top_common.mux_rsrc[i].res_type ==
CAM_VFE_CAMIF_VER_4_0) {
rc = cam_vfe_res_mux_deinit(
&top_priv->top_common.mux_rsrc[i]);
if (rc)
CAM_ERR(CAM_ISP, "Camif deinit failed rc=%d",
rc);
} else if (top_priv->top_common.mux_rsrc[i].res_type ==
CAM_VFE_IN_RD_VER_1_0) {
rc = cam_vfe_fe_ver1_deinit(
&top_priv->top_common.mux_rsrc[i]);
if (rc)
CAM_ERR(CAM_ISP, "Camif deinit failed rc=%d",
rc);
} else {
rc = cam_vfe_res_mux_deinit(
&top_priv->top_common.mux_rsrc[i]);
if (rc)
CAM_ERR(CAM_ISP,
"Camif lite res id %d Deinit failed",
top_priv->top_common.mux_rsrc[i]
.res_id);
}
rc = cam_vfe_res_mux_deinit(&top_priv->top_common.mux_rsrc[i]);
if (rc)
CAM_ERR(CAM_ISP, "Mux[%d] deinit failed rc=%d", i, rc);
}
kfree(vfe_top->top_priv);

59
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_top_ver4.h
Dosyayı Görüntüle

@@ -6,22 +6,10 @@
#ifndef _CAM_VFE_TOP_VER4_H_
#define _CAM_VFE_TOP_VER4_H_
#include "cam_vfe_fe_ver1.h"
#include "cam_vfe_top_common.h"
#include "cam_isp_hw.h"
#include "cam_vfe_top.h"
#define CAM_SHIFT_TOP_CORE_VER_4_CFG_VID_DS16_R2PD 16
#define CAM_SHIFT_TOP_CORE_VER_4_CFG_VID_DS4_R2PD 15
#define CAM_SHIFT_TOP_CORE_VER_4_CFG_DISP_DS16_R2PD 14
#define CAM_SHIFT_TOP_CORE_VER_4_CFG_DISP_DS4_R2PD 13
#define CAM_SHIFT_TOP_CORE_VER_4_CFG_DSP_STREAMING 10
#define CAM_SHIFT_TOP_CORE_VER_4_CFG_STATS_IHIST 4
#define CAM_SHIFT_TOP_CORE_VER_4_CFG_PP_INPUT_FMT 2
#define CAM_SHIFT_TOP_CORE_VER_4_CFG_HDR_MUX_PP 0
#define CAM_SHIFT_TOP_CORE_VER_4_CFG_DSP_MODE 9
#define CAM_SHIFT_TOP_CORE_VER_4_CFG_DSP_EN 8
#define CAM_VFE_RDI_VER2_MAX 4
#define CAM_VFE_CAMIF_LITE_EVT_MAX 256
#define CAM_VFE_TOP_DBG_REG_MAX 17
@@ -102,17 +90,15 @@ struct cam_vfe_top_ver4_hw_info {
struct cam_vfe_top_ver4_reg_offset_common *common_reg;
struct cam_vfe_ver4_path_hw_info vfe_full_hw_info;
struct cam_vfe_ver4_path_hw_info pdlib_hw_info;
struct cam_vfe_ver4_path_hw_info
*rdi_hw_info[CAM_VFE_RDI_VER2_MAX];
struct cam_vfe_ver4_path_hw_info lcr_hw_info;
struct cam_vfe_fe_ver1_hw_info fe_hw_info;
struct cam_vfe_ver4_path_hw_info *rdi_hw_info[
CAM_VFE_RDI_VER2_MAX];
struct cam_vfe_ver4_path_reg_data *reg_data;
struct cam_vfe_top_ver4_wr_client_desc *wr_client_desc;
struct cam_vfe_top_ver4_module_desc *module_desc;
struct cam_vfe_top_camnoc_debug_data *camnoc_debug_data;
uint32_t num_reg;
uint32_t num_mux;
struct cam_vfe_ver4_path_reg_data *reg_data;
struct cam_vfe_top_ver4_wr_client_desc *wr_client_desc;
struct cam_vfe_top_ver4_module_desc *module_desc;
struct cam_vfe_top_camnoc_debug_data *camnoc_debug_data;
uint32_t num_reg;
uint32_t num_mux;
uint32_t mux_type[CAM_VFE_TOP_MUX_MAX];
};
@@ -137,33 +123,4 @@ int cam_vfe_top_ver4_init(struct cam_hw_soc_info *soc_info,
int cam_vfe_top_ver4_deinit(struct cam_vfe_top **vfe_top);
int cam_vfe_full_node_ver4_acquire_resource(
struct cam_isp_resource_node *vfe_res,
void *acquire_param);
int cam_vfe_full_node_ver4_init(
struct cam_hw_intf *hw_intf,
struct cam_hw_soc_info *soc_info,
void *camif_hw_info,
struct cam_isp_resource_node *camif_node,
void *vfe_irq_controller);
int cam_vfe_full_node_ver4_deinit(
struct cam_isp_resource_node *vfe_node);
int cam_vfe_lite_node_ver4_acquire_resource(
struct cam_isp_resource_node *vfe_lite_res,
void *acquire_param);
int cam_vfe_lite_node_ver4_init(
struct cam_hw_intf *hw_intf,
struct cam_hw_soc_info *soc_info,
void *camif_lite_hw_info,
struct cam_isp_resource_node *camif_lite_node,
void *vfe_irq_controller);
int cam_vfe_lite_node_ver4_deinit(
struct cam_isp_resource_node *vfe_node);
#endif /* _CAM_VFE_TOP_VER4_H_ */