samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: isp: Re-assign WMs for UAPI port names" into camera-kernel.lnx.5.0

Browse Source
This commit is contained in:
Savita Patted
2021-03-16 17:42:58 -07:00
committed by Gerrit - the friendly Code Review server
parent 1b9a9b571f 5ce6aebaad
commit 0626095cbc
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/cam_isp/cam_isp_context.c
View File

@@ -572,8 +572,8 @@ static const char *__cam_isp_resource_handle_id_to_type(
return "LCR"; return "LCR";
case CAM_ISP_IFE_OUT_RES_AWB_BFW: case CAM_ISP_IFE_OUT_RES_AWB_BFW:
return "AWB_BFW"; return "AWB_BFW";
case CAM_ISP_IFE_OUT_RES_2PD_STATS: case CAM_ISP_IFE_OUT_RES_PREPROCESS_2PD:
return "2PD_STATS"; return "PREPROCESS_2PD";
case CAM_ISP_IFE_OUT_RES_STATS_AEC_BE: case CAM_ISP_IFE_OUT_RES_STATS_AEC_BE:
return "STATS_AEC_BE"; return "STATS_AEC_BE";
case CAM_ISP_IFE_OUT_RES_LTM_STATS: case CAM_ISP_IFE_OUT_RES_LTM_STATS:

4
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe680.h
View File

@@ -1701,7 +1701,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680_bus_hw_info = {
}, },
}, },
{ {
.vfe_out_type = CAM_VFE_BUS_VER3_VFE_OUT_2PD, .vfe_out_type = CAM_VFE_BUS_VER3_VFE_OUT_PREPROCESS_2PD,
.max_width = 1920, .max_width = 1920,
.max_height = 1080, .max_height = 1080,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_1, .source_group = CAM_VFE_BUS_VER3_SRC_GRP_1,
@@ -1731,7 +1731,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680_bus_hw_info = {
}, },
}, },
{ {
.vfe_out_type = CAM_VFE_BUS_VER3_VFE_OUT_2PD_STATS, .vfe_out_type = CAM_VFE_BUS_VER3_VFE_OUT_2PD,
.max_width = -1, .max_width = -1,
.max_height = -1, .max_height = -1,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_1, .source_group = CAM_VFE_BUS_VER3_SRC_GRP_1,

10
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c
View File

@@ -668,8 +668,8 @@ static enum cam_vfe_bus_ver3_vfe_out_type
case CAM_ISP_IFE_OUT_RES_AWB_BFW: case CAM_ISP_IFE_OUT_RES_AWB_BFW:
vfe_out_type = CAM_VFE_BUS_VER3_VFE_OUT_AWB_BFW; vfe_out_type = CAM_VFE_BUS_VER3_VFE_OUT_AWB_BFW;
break; break;
case CAM_ISP_IFE_OUT_RES_2PD_STATS: case CAM_ISP_IFE_OUT_RES_PREPROCESS_2PD:
vfe_out_type = CAM_VFE_BUS_VER3_VFE_OUT_2PD_STATS; vfe_out_type = CAM_VFE_BUS_VER3_VFE_OUT_PREPROCESS_2PD;
break; break;
case CAM_ISP_IFE_OUT_RES_STATS_AEC_BE: case CAM_ISP_IFE_OUT_RES_STATS_AEC_BE:
vfe_out_type = CAM_VFE_BUS_VER3_VFE_OUT_STATS_AEC_BE; vfe_out_type = CAM_VFE_BUS_VER3_VFE_OUT_STATS_AEC_BE;
@@ -779,8 +779,8 @@ static int cam_vfe_bus_ver3_get_comp_vfe_out_res_id_list(
if (comp_mask & (1 << CAM_VFE_BUS_VER3_VFE_OUT_AWB_BFW)) if (comp_mask & (1 << CAM_VFE_BUS_VER3_VFE_OUT_AWB_BFW))
out_list[count++] = CAM_ISP_IFE_OUT_RES_AWB_BFW; out_list[count++] = CAM_ISP_IFE_OUT_RES_AWB_BFW;
if (comp_mask & (1 << CAM_VFE_BUS_VER3_VFE_OUT_2PD_STATS)) if (comp_mask & (1 << CAM_VFE_BUS_VER3_VFE_OUT_PREPROCESS_2PD))
out_list[count++] = CAM_ISP_IFE_OUT_RES_2PD_STATS; out_list[count++] = CAM_ISP_IFE_OUT_RES_PREPROCESS_2PD;
if (comp_mask & (1 << CAM_VFE_BUS_VER3_VFE_OUT_STATS_AEC_BE)) if (comp_mask & (1 << CAM_VFE_BUS_VER3_VFE_OUT_STATS_AEC_BE))
out_list[count++] = CAM_ISP_IFE_OUT_RES_STATS_AEC_BE; out_list[count++] = CAM_ISP_IFE_OUT_RES_STATS_AEC_BE;
@@ -1289,7 +1289,7 @@ static int cam_vfe_bus_ver3_acquire_wm(
rsrc_data->en_cfg = 0x1; rsrc_data->en_cfg = 0x1;
} else if ((vfe_out_res_id >= CAM_VFE_BUS_VER3_VFE_OUT_AWB_BFW) && } else if ((vfe_out_res_id >= CAM_VFE_BUS_VER3_VFE_OUT_AWB_BFW) &&
(vfe_out_res_id <= CAM_VFE_BUS_VER3_VFE_OUT_2PD_STATS)) { (vfe_out_res_id <= CAM_VFE_BUS_VER3_VFE_OUT_PREPROCESS_2PD)) {
switch (rsrc_data->format) { switch (rsrc_data->format) {
case CAM_FORMAT_PLAIN64: case CAM_FORMAT_PLAIN64:
rsrc_data->width = 0; rsrc_data->width = 0;

4
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.h
View File

@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* /*
* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
*/ */
@@ -78,7 +78,7 @@ enum cam_vfe_bus_ver3_vfe_out_type {
CAM_VFE_BUS_VER3_VFE_OUT_2PD, CAM_VFE_BUS_VER3_VFE_OUT_2PD,
CAM_VFE_BUS_VER3_VFE_OUT_LCR, CAM_VFE_BUS_VER3_VFE_OUT_LCR,
CAM_VFE_BUS_VER3_VFE_OUT_AWB_BFW, CAM_VFE_BUS_VER3_VFE_OUT_AWB_BFW,
CAM_VFE_BUS_VER3_VFE_OUT_2PD_STATS, CAM_VFE_BUS_VER3_VFE_OUT_PREPROCESS_2PD,
CAM_VFE_BUS_VER3_VFE_OUT_STATS_AEC_BE, CAM_VFE_BUS_VER3_VFE_OUT_STATS_AEC_BE,
CAM_VFE_BUS_VER3_VFE_OUT_LTM_STATS, CAM_VFE_BUS_VER3_VFE_OUT_LTM_STATS,
CAM_VFE_BUS_VER3_VFE_OUT_STATS_GTM_BHIST, CAM_VFE_BUS_VER3_VFE_OUT_STATS_GTM_BHIST,

4
include/uapi/camera/media/cam_isp_ife.h
View File

@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
/* /*
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
*/ */
#ifndef __UAPI_CAM_ISP_IFE_H__ #ifndef __UAPI_CAM_ISP_IFE_H__
@@ -35,7 +35,7 @@
#define CAM_ISP_IFE_OUT_RES_RDI_RD (CAM_ISP_IFE_OUT_RES_BASE + 23) #define CAM_ISP_IFE_OUT_RES_RDI_RD (CAM_ISP_IFE_OUT_RES_BASE + 23)
#define CAM_ISP_IFE_OUT_RES_LCR (CAM_ISP_IFE_OUT_RES_BASE + 24) #define CAM_ISP_IFE_OUT_RES_LCR (CAM_ISP_IFE_OUT_RES_BASE + 24)
#define CAM_ISP_IFE_OUT_RES_SPARSE_PD (CAM_ISP_IFE_OUT_RES_BASE + 25) #define CAM_ISP_IFE_OUT_RES_SPARSE_PD (CAM_ISP_IFE_OUT_RES_BASE + 25)
#define CAM_ISP_IFE_OUT_RES_2PD_STATS (CAM_ISP_IFE_OUT_RES_BASE + 26) #define CAM_ISP_IFE_OUT_RES_PREPROCESS_2PD (CAM_ISP_IFE_OUT_RES_BASE + 26)
#define CAM_ISP_IFE_OUT_RES_AWB_BFW (CAM_ISP_IFE_OUT_RES_BASE + 27) #define CAM_ISP_IFE_OUT_RES_AWB_BFW (CAM_ISP_IFE_OUT_RES_BASE + 27)
#define CAM_ISP_IFE_OUT_RES_STATS_AEC_BE (CAM_ISP_IFE_OUT_RES_BASE + 28) #define CAM_ISP_IFE_OUT_RES_STATS_AEC_BE (CAM_ISP_IFE_OUT_RES_BASE + 28)
#define CAM_ISP_IFE_OUT_RES_LTM_STATS (CAM_ISP_IFE_OUT_RES_BASE + 29) #define CAM_ISP_IFE_OUT_RES_LTM_STATS (CAM_ISP_IFE_OUT_RES_BASE + 29)