iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: atomisp: drop luma_only, input_yuv and input_raw from ISP2401

Browse Source 
This patch removes luma_only, input_yuv and input_raw from
`struct ia_css_binary_info` as well as its usage [1]. Note that for
input_yuv and input_raw, only the definitions were removed because these
were not used anywhere.

[1] added on updating css version to irci_master_20150701_0213
    https://raw.githubusercontent.com/intel/ProductionKernelQuilts/cht-m1stable-2016_ww31/uefi/cht-m1stable/patches/cam-0439-atomisp2-css2401-and-2401_legacy-irci_master_2015070.patch
    ("atomisp2: css2401 and 2401_legacy-irci_master_20150701_0213")

Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Tsuchiya Yuto 2021-10-18 01:19:48 +09:00 committed by Mauro Carvalho Chehab
parent 5a1b272555
commit fc3b36a783
5 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_binarydesc.c
View File

@ -58,7 +58,6 @@ static void pipe_binarydesc_get_offline(
descr->enable_dz = true; descr->enable_dz = true;
descr->enable_xnr = false; descr->enable_xnr = false;
descr->enable_dpc = false; descr->enable_dpc = false;
descr->enable_luma_only = false;
descr->enable_tnr = false; descr->enable_tnr = false;
descr->enable_capture_pp_bli = false; descr->enable_capture_pp_bli = false;
descr->enable_fractional_ds = false; descr->enable_fractional_ds = false;
@ -390,8 +389,6 @@ int ia_css_pipe_get_video_binarydesc(
pipe->extra_config.enable_fractional_ds; pipe->extra_config.enable_fractional_ds;
video_descr->enable_dpc = video_descr->enable_dpc =
pipe->config.enable_dpc; pipe->config.enable_dpc;
video_descr->enable_luma_only =
pipe->config.enable_luma_only;
video_descr->enable_tnr = video_descr->enable_tnr =
pipe->config.enable_tnr; pipe->config.enable_tnr;
@ -600,8 +597,6 @@ void ia_css_pipe_get_primary_binarydesc(
prim_descr->isp_pipe_version = pipe->config.isp_pipe_version; prim_descr->isp_pipe_version = pipe->config.isp_pipe_version;
prim_descr->enable_fractional_ds = prim_descr->enable_fractional_ds =
pipe->extra_config.enable_fractional_ds; pipe->extra_config.enable_fractional_ds;
prim_descr->enable_luma_only =
pipe->config.enable_luma_only;
/* We have both striped and non-striped primary binaries, /* We have both striped and non-striped primary binaries,
* if continuous viewfinder is required, then we must select * if continuous viewfinder is required, then we must select
* a striped one. Otherwise we prefer to use a non-striped * a striped one. Otherwise we prefer to use a non-striped

5
drivers/staging/media/atomisp/pci/ia_css_acc_types.h
View File

@ -222,11 +222,6 @@ struct ia_css_binary_info {
struct ia_css_isp_param_isp_segments mem_initializers; struct ia_css_isp_param_isp_segments mem_initializers;
/* MW: Packing (related) bools in an integer ?? */ /* MW: Packing (related) bools in an integer ?? */
struct { struct {
/* ISP2401 */
u8 luma_only;
u8 input_yuv;
u8 input_raw;
u8 reduced_pipe; u8 reduced_pipe;
u8 vf_veceven; u8 vf_veceven;
u8 dis; u8 dis;

3
drivers/staging/media/atomisp/pci/ia_css_pipe_public.h
View File

@ -123,9 +123,6 @@ struct ia_css_pipe_config {
processing stages. */ processing stages. */
/* ISP2401 */ /* ISP2401 */
bool enable_luma_only;
/** Enabling of monochrome mode for a pipeline. If enabled only luma processing
will be done. */
bool enable_tnr; bool enable_tnr;
/** Enabling of TNR (temporal noise reduction). This is only applicable to video /** Enabling of TNR (temporal noise reduction). This is only applicable to video
pipes. Non video-pipes should always set this parameter to false. */ pipes. Non video-pipes should always set this parameter to false. */

1
drivers/staging/media/atomisp/pci/runtime/binary/interface/ia_css_binary.h
View File

@ -94,7 +94,6 @@ struct ia_css_binary_descr {
bool enable_dpc; bool enable_dpc;
/* ISP2401 */ /* ISP2401 */
bool enable_luma_only;
bool enable_tnr; bool enable_tnr;
bool enable_capture_pp_bli; bool enable_capture_pp_bli;

14
drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
View File

@ -1394,9 +1394,6 @@ static int __ia_css_binary_find(struct ia_css_binary_descr *descr,
bool enable_dvs_6axis; bool enable_dvs_6axis;
bool enable_reduced_pipe; bool enable_reduced_pipe;
bool enable_capture_pp_bli; bool enable_capture_pp_bli;
#ifdef ISP2401
bool enable_luma_only;
#endif
int err = -EINVAL; int err = -EINVAL;
bool continuous; bool continuous;
unsigned int isp_pipe_version; unsigned int isp_pipe_version;
@ -1450,9 +1447,6 @@ static int __ia_css_binary_find(struct ia_css_binary_descr *descr,
enable_dvs_6axis = descr->enable_dvs_6axis; enable_dvs_6axis = descr->enable_dvs_6axis;
enable_reduced_pipe = descr->enable_reduced_pipe; enable_reduced_pipe = descr->enable_reduced_pipe;
enable_capture_pp_bli = descr->enable_capture_pp_bli; enable_capture_pp_bli = descr->enable_capture_pp_bli;
#ifdef ISP2401
enable_luma_only = descr->enable_luma_only;
#endif
continuous = descr->continuous; continuous = descr->continuous;
striped = descr->striped; striped = descr->striped;
isp_pipe_version = descr->isp_pipe_version; isp_pipe_version = descr->isp_pipe_version;
@ -1748,14 +1742,6 @@ static int __ia_css_binary_find(struct ia_css_binary_descr *descr,
} }
#ifdef ISP2401 #ifdef ISP2401
if (candidate->enable.luma_only != enable_luma_only) {
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
"ia_css_binary_find() [%d] continue: %d != %d\n",
__LINE__, candidate->enable.luma_only,
descr->enable_luma_only);
continue;
}
if (!candidate->enable.tnr && need_tnr) { if (!candidate->enable.tnr && need_tnr) {
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
"ia_css_binary_find() [%d] continue: !%d && %d\n", "ia_css_binary_find() [%d] continue: !%d && %d\n",