samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Código Issues Pull requests Ações Pacotes Projetos Versões Wiki Atividade

Merge "msm: camera: isp: Add fixes for vfe and vfe lite 680 header" into camera-kernel.lnx.5.0

Ver código fonte
Esse commit está contido em:
Camera Software Integration
2021-07-09 18:53:26 -07:00
commit de Gerrit - the friendly Code Review server
pai 769d026c3a c293125d30
commit 8bb1a5d505
2 arquivos alterados com 10 adições e 5 exclusões
Baixar arquivo de patch Baixar arquivo de diferenças Expandir todos os arquivos Colapsar todos os arquivos

7
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe680.h
Ver arquivo

@@ -697,7 +697,6 @@ static struct cam_vfe_bus_ver3_hw_info vfe680_bus_hw_info = {
0x00000C3C,
0x00000C40,
0x00000C44,
0x00000C48,
},
.ubwc_static_ctrl = 0x00000C58,
.pwr_iso_cfg = 0x00000C5C,
@@ -1550,7 +1549,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680_bus_hw_info = {
.max_width = -1,
.max_height = -1,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_2,
.mid[0] = 8,
.mid[0] = 18,
.num_wm = 1,
.line_based = 1,
.wm_idx = {
@@ -1565,7 +1564,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680_bus_hw_info = {
.max_width = -1,
.max_height = -1,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_3,
.mid[0] = 9,
.mid[0] = 19,
.num_wm = 1,
.line_based = 1,
.wm_idx = {
@@ -1580,7 +1579,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680_bus_hw_info = {
.max_width = -1,
.max_height = -1,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_4,
.mid[0] = 10,
.mid[0] = 20,
.num_wm = 1,
.line_based = 1,
.wm_idx = {

8
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe_lite68x.h
Ver arquivo

@@ -407,6 +407,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680x_bus_hw_info = {
.max_height = -1,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_1,
.num_wm = 1,
.mid[0] = 8,
.wm_idx = {
0,
},
@@ -420,6 +421,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680x_bus_hw_info = {
.max_height = -1,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_2,
.num_wm = 1,
.mid[0] = 9,
.wm_idx = {
1,
},
@@ -433,6 +435,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680x_bus_hw_info = {
.max_height = -1,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_3,
.num_wm = 1,
.mid[0] = 10,
.wm_idx = {
2,
},
@@ -446,6 +449,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680x_bus_hw_info = {
.max_height = -1,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_4,
.num_wm = 1,
.mid[0] = 11,
.wm_idx = {
3,
},
@@ -460,6 +464,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680x_bus_hw_info = {
.max_height = 1080,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_0,
.num_wm = 1,
.mid[0] = 12,
.wm_idx = {
4,
},
@@ -473,6 +478,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680x_bus_hw_info = {
.max_height = -1,
.source_group = CAM_VFE_BUS_VER3_SRC_GRP_0,
.num_wm = 1,
.mid[0] = 13,
.wm_idx = {
5,
},
@@ -481,7 +487,7 @@ static struct cam_vfe_bus_ver3_hw_info vfe680x_bus_hw_info = {
},
},
},
.num_comp_grp = 4,
.num_comp_grp = 5,
.support_consumed_addr = true,
.comp_done_shift = 0,
.top_irq_shift = 1,