samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

Merge "msm: camera: isp: Configure frame based WM config for PLAIN16" into camera-kernel.lnx.5.0

Telusuri Sumber
This commit is contained in:
Savita Patted
2021-08-05 18:48:25 -07:00
committed by Gerrit - the friendly Code Review server
orang tua 4b39865386 7d98cf34e9
melakukan 67885d1c54
1 mengubah file dengan 85 tambahan dan 49 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files

134
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus_wr.c
Melihat File

@@ -64,7 +64,7 @@ enum cam_sfe_bus_wr_packer_format {
};
enum cam_sfe_bus_wr_wm_mode {
CAM_SFE_WM_LINE_BASED_MODE = 1,
CAM_SFE_WM_LINE_BASED_MODE,
CAM_SFE_WM_FRAME_BASED_MODE,
CAM_SFE_WM_INDEX_BASED_MODE,
};
@@ -493,6 +493,15 @@ static void cam_sfe_bus_wr_get_constraint_errors(
}
}
static inline void cam_sfe_bus_config_rdi_wm_frame_based_mode(
struct cam_sfe_bus_wr_wm_resource_data *rsrc_data)
{
rsrc_data->width = CAM_SFE_RDI_BUS_DEFAULT_WIDTH;
rsrc_data->height = 0;
rsrc_data->stride = CAM_SFE_RDI_BUS_DEFAULT_STRIDE;
rsrc_data->en_cfg = (0x1 << 16) | 0x1;
}
static int cam_sfe_bus_config_rdi_wm(
struct cam_sfe_bus_wr_wm_resource_data *rsrc_data)
{
@@ -503,11 +512,11 @@ static int cam_sfe_bus_config_rdi_wm(
rsrc_data->en_cfg = 0x1;
rsrc_data->width =
ALIGNUP((rsrc_data->width * 5) / 4, 16) / 16;
} else if (rsrc_data->wm_mode == CAM_SFE_WM_FRAME_BASED_MODE) {
cam_sfe_bus_config_rdi_wm_frame_based_mode(rsrc_data);
} else {
rsrc_data->width = CAM_SFE_RDI_BUS_DEFAULT_WIDTH;
rsrc_data->height = 0;
rsrc_data->stride = CAM_SFE_RDI_BUS_DEFAULT_STRIDE;
rsrc_data->en_cfg = (0x1 << 16) | 0x1;
CAM_WARN(CAM_SFE, "No index mode support for SFE WM: %u",
rsrc_data->index);
}
break;
case CAM_FORMAT_MIPI_RAW_6:
@@ -515,11 +524,11 @@ static int cam_sfe_bus_config_rdi_wm(
rsrc_data->en_cfg = 0x1;
rsrc_data->width =
ALIGNUP((rsrc_data->width * 3) / 4, 16) / 16;
} else if (rsrc_data->wm_mode == CAM_SFE_WM_FRAME_BASED_MODE) {
cam_sfe_bus_config_rdi_wm_frame_based_mode(rsrc_data);
} else {
rsrc_data->width = CAM_SFE_RDI_BUS_DEFAULT_WIDTH;
rsrc_data->height = 0;
rsrc_data->stride = CAM_SFE_RDI_BUS_DEFAULT_STRIDE;
rsrc_data->en_cfg = (0x1 << 16) | 0x1;
CAM_WARN(CAM_SFE, "No index mode support for SFE WM: %u",
rsrc_data->index);
}
break;
case CAM_FORMAT_MIPI_RAW_8:
@@ -527,11 +536,11 @@ static int cam_sfe_bus_config_rdi_wm(
rsrc_data->en_cfg = 0x1;
rsrc_data->width =
ALIGNUP(rsrc_data->width, 16) / 16;
} else if (rsrc_data->wm_mode == CAM_SFE_WM_FRAME_BASED_MODE) {
cam_sfe_bus_config_rdi_wm_frame_based_mode(rsrc_data);
} else {
rsrc_data->width = CAM_SFE_RDI_BUS_DEFAULT_WIDTH;
rsrc_data->height = 0;
rsrc_data->stride = CAM_SFE_RDI_BUS_DEFAULT_STRIDE;
rsrc_data->en_cfg = (0x1 << 16) | 0x1;
CAM_WARN(CAM_SFE, "No index mode support for SFE WM: %u",
rsrc_data->index);
}
break;
case CAM_FORMAT_MIPI_RAW_12:
@@ -539,11 +548,11 @@ static int cam_sfe_bus_config_rdi_wm(
rsrc_data->en_cfg = 0x1;
rsrc_data->width =
ALIGNUP((rsrc_data->width * 3) / 2, 16) / 16;
} else if (rsrc_data->wm_mode == CAM_SFE_WM_FRAME_BASED_MODE) {
cam_sfe_bus_config_rdi_wm_frame_based_mode(rsrc_data);
} else {
rsrc_data->width = CAM_SFE_RDI_BUS_DEFAULT_WIDTH;
rsrc_data->height = 0;
rsrc_data->stride = CAM_SFE_RDI_BUS_DEFAULT_STRIDE;
rsrc_data->en_cfg = (0x1 << 16) | 0x1;
CAM_WARN(CAM_SFE, "No index mode support for SFE WM: %u",
rsrc_data->index);
}
break;
case CAM_FORMAT_MIPI_RAW_14:
@@ -551,11 +560,11 @@ static int cam_sfe_bus_config_rdi_wm(
rsrc_data->en_cfg = 0x1;
rsrc_data->width =
ALIGNUP((rsrc_data->width * 7) / 2, 16) / 16;
} else if (rsrc_data->wm_mode == CAM_SFE_WM_FRAME_BASED_MODE) {
cam_sfe_bus_config_rdi_wm_frame_based_mode(rsrc_data);
} else {
rsrc_data->width = CAM_SFE_RDI_BUS_DEFAULT_WIDTH;
rsrc_data->height = 0;
rsrc_data->stride = CAM_SFE_RDI_BUS_DEFAULT_STRIDE;
rsrc_data->en_cfg = (0x1 << 16) | 0x1;
CAM_WARN(CAM_SFE, "No index mode support for SFE WM: %u",
rsrc_data->index);
}
break;
case CAM_FORMAT_MIPI_RAW_16:
@@ -563,11 +572,11 @@ static int cam_sfe_bus_config_rdi_wm(
rsrc_data->en_cfg = 0x1;
rsrc_data->width =
ALIGNUP((rsrc_data->width * 2), 16) / 16;
} else if (rsrc_data->wm_mode == CAM_SFE_WM_FRAME_BASED_MODE) {
cam_sfe_bus_config_rdi_wm_frame_based_mode(rsrc_data);
} else {
rsrc_data->width = CAM_SFE_RDI_BUS_DEFAULT_WIDTH;
rsrc_data->height = 0;
rsrc_data->stride = CAM_SFE_RDI_BUS_DEFAULT_STRIDE;
rsrc_data->en_cfg = (0x1 << 16) | 0x1;
CAM_WARN(CAM_SFE, "No index mode support for SFE WM: %u",
rsrc_data->index);
}
break;
case CAM_FORMAT_MIPI_RAW_20:
@@ -575,11 +584,11 @@ static int cam_sfe_bus_config_rdi_wm(
rsrc_data->en_cfg = 0x1;
rsrc_data->width =
ALIGNUP((rsrc_data->width * 5) / 2, 16) / 16;
} else if (rsrc_data->wm_mode == CAM_SFE_WM_FRAME_BASED_MODE) {
cam_sfe_bus_config_rdi_wm_frame_based_mode(rsrc_data);
} else {
rsrc_data->width = CAM_SFE_RDI_BUS_DEFAULT_WIDTH;
rsrc_data->height = 0;
rsrc_data->stride = CAM_SFE_RDI_BUS_DEFAULT_STRIDE;
rsrc_data->en_cfg = (0x1 << 16) | 0x1;
CAM_WARN(CAM_SFE, "No index mode support for SFE WM: %u",
rsrc_data->index);
}
break;
case CAM_FORMAT_PLAIN128:
@@ -587,11 +596,11 @@ static int cam_sfe_bus_config_rdi_wm(
rsrc_data->en_cfg = 0x1;
rsrc_data->width =
ALIGNUP((rsrc_data->width * 16), 16) / 16;
} else if (rsrc_data->wm_mode == CAM_SFE_WM_FRAME_BASED_MODE) {
cam_sfe_bus_config_rdi_wm_frame_based_mode(rsrc_data);
} else {
rsrc_data->width = CAM_SFE_RDI_BUS_DEFAULT_WIDTH;
rsrc_data->height = 0;
rsrc_data->stride = CAM_SFE_RDI_BUS_DEFAULT_STRIDE;
rsrc_data->en_cfg = (0x1 << 16) | 0x1;
CAM_WARN(CAM_SFE, "No index mode support for SFE WM: %u",
rsrc_data->index);
}
break;
case CAM_FORMAT_PLAIN32_20:
@@ -599,29 +608,50 @@ static int cam_sfe_bus_config_rdi_wm(
rsrc_data->en_cfg = 0x1;
rsrc_data->width =
ALIGNUP((rsrc_data->width * 4), 16) / 16;
} else if (rsrc_data->wm_mode == CAM_SFE_WM_FRAME_BASED_MODE) {
cam_sfe_bus_config_rdi_wm_frame_based_mode(rsrc_data);
} else {
rsrc_data->width = CAM_SFE_RDI_BUS_DEFAULT_WIDTH;
rsrc_data->height = 0;
rsrc_data->stride = CAM_SFE_RDI_BUS_DEFAULT_STRIDE;
rsrc_data->en_cfg = (0x1 << 16) | 0x1;
CAM_WARN(CAM_SFE, "No index mode support for SFE WM: %u",
rsrc_data->index);
}
break;
case CAM_FORMAT_PLAIN8:
rsrc_data->en_cfg = 0x1;
rsrc_data->stride = rsrc_data->width * 2;
if (rsrc_data->wm_mode == CAM_SFE_WM_LINE_BASED_MODE) {
rsrc_data->en_cfg = 0x1;
rsrc_data->stride = rsrc_data->width * 2;
} else if (rsrc_data->wm_mode == CAM_SFE_WM_FRAME_BASED_MODE) {
cam_sfe_bus_config_rdi_wm_frame_based_mode(rsrc_data);
} else {
CAM_WARN(CAM_SFE, "No index mode support for SFE WM: %u",
rsrc_data->index);
}
break;
case CAM_FORMAT_PLAIN16_10:
case CAM_FORMAT_PLAIN16_12:
case CAM_FORMAT_PLAIN16_14:
case CAM_FORMAT_PLAIN16_16:
rsrc_data->width =
ALIGNUP(rsrc_data->width * 2, 16) / 16;
rsrc_data->en_cfg = 0x1;
if (rsrc_data->wm_mode == CAM_SFE_WM_LINE_BASED_MODE) {
rsrc_data->width =
ALIGNUP(rsrc_data->width * 2, 16) / 16;
rsrc_data->en_cfg = 0x1;
} else if (rsrc_data->wm_mode == CAM_SFE_WM_FRAME_BASED_MODE) {
cam_sfe_bus_config_rdi_wm_frame_based_mode(rsrc_data);
} else {
CAM_WARN(CAM_SFE, "No index mode support for SFE WM: %u",
rsrc_data->index);
}
break;
case CAM_FORMAT_PLAIN64:
rsrc_data->width =
ALIGNUP(rsrc_data->width * 8, 16) / 16;
rsrc_data->en_cfg = 0x1;
if (rsrc_data->wm_mode == CAM_SFE_WM_LINE_BASED_MODE) {
rsrc_data->width =
ALIGNUP(rsrc_data->width * 8, 16) / 16;
rsrc_data->en_cfg = 0x1;
} else if (rsrc_data->wm_mode == CAM_SFE_WM_FRAME_BASED_MODE) {
cam_sfe_bus_config_rdi_wm_frame_based_mode(rsrc_data);
} else {
CAM_WARN(CAM_SFE, "No index mode support for SFE WM: %u",
rsrc_data->index);
}
break;
default:
CAM_ERR(CAM_SFE, "Unsupported RDI format %d",
@@ -2722,7 +2752,7 @@ static int cam_sfe_bus_wr_update_wm_config(
for (i = 0; i < sfe_out_data->num_wm; i++) {
wm_data = sfe_out_data->wm_res[i].res_priv;
if (wm_config->wm_mode > 0x2) {
if (wm_config->wm_mode > CAM_SFE_WM_INDEX_BASED_MODE) {
CAM_ERR(CAM_SFE, "Invalid wm_mode: 0x%X WM:%d",
wm_config->wm_mode, wm_data->index);
return -EINVAL;
@@ -2732,9 +2762,15 @@ static int cam_sfe_bus_wr_update_wm_config(
wm_data->width = wm_config->width;
if ((sfe_out_data->out_type >= CAM_SFE_BUS_SFE_OUT_RDI0) &&
(sfe_out_data->out_type <= CAM_SFE_BUS_SFE_OUT_RDI4)) {
/* WM mode enum starts at 1, userland to send based on HW desc */
wm_data->wm_mode = wm_config->wm_mode + 1;
cam_sfe_bus_config_rdi_wm(wm_data);
wm_data->wm_mode = wm_config->wm_mode;
/*
* Update width based on format for line based mode only
* Image size ignored for frame based mode
* Index based not supported currently
*/
if (wm_data->wm_mode == CAM_SFE_WM_LINE_BASED_MODE)
cam_sfe_bus_config_rdi_wm(wm_data);
}
if (i == PLANE_C)