Commit 2a01213b authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: solve #ifdef HAS_NO_PACKED_RAW_PIXELS 



This was never defined, so remove the #ifdefs, keeping the
code.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 9e22032e

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

+0 −2
Original line number Diff line number Diff line
@@ -571,11 +571,9 @@ void ia_css_pipe_get_primary_binarydesc( 
	in_info->res = pipe->config.input_effective_res;

	in_info->padded_width = in_info->res.width;



#if !defined(HAS_NO_PACKED_RAW_PIXELS)

	if (pipe->stream->config.pack_raw_pixels)

		in_info->format = IA_CSS_FRAME_FORMAT_RAW_PACKED;

	else

#endif

		in_info->format = IA_CSS_FRAME_FORMAT_RAW;



	in_info->raw_bit_depth = ia_css_pipe_util_pipe_input_format_bpp(pipe);

drivers/staging/media/atomisp/pci/sh_css.c

+0 −2
Original line number Diff line number Diff line
@@ -2570,13 +2570,11 @@ alloc_continuous_frames(struct ia_css_pipe *pipe, bool init_time) 
	ref_info.padded_width = CEIL_MUL(ref_info.res.width, 2 * ISP_VEC_NELEMS);

#endif



#if !defined(HAS_NO_PACKED_RAW_PIXELS)

	if (pipe->stream->config.pack_raw_pixels) {

		ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

				    "alloc_continuous_frames() IA_CSS_FRAME_FORMAT_RAW_PACKED\n");

		ref_info.format = IA_CSS_FRAME_FORMAT_RAW_PACKED;

	} else

#endif

	{

		ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

				    "alloc_continuous_frames() IA_CSS_FRAME_FORMAT_RAW\n");

drivers/staging/media/atomisp/pci/sh_css_mipi.c

+0 −4
Original line number Diff line number Diff line
@@ -133,15 +133,11 @@ ia_css_mipi_frame_calculate_size(const unsigned int width, 
		break;

	case ATOMISP_INPUT_FORMAT_YUV420_10:		/* odd 4p, 5B, 40bits, even 4p, 10B, 80bits */

	case ATOMISP_INPUT_FORMAT_RAW_10:		/* 4p, 5B, 40bits */

#if !defined(HAS_NO_PACKED_RAW_PIXELS)

		/* The changes will be reverted as soon as RAW

		 * Buffers are deployed by the 2401 Input System

		 * in the non-continuous use scenario.

		 */

		bits_per_pixel = 10;

#else

		bits_per_pixel = 16;

#endif

		break;

	case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:	/* 2p, 3B, 24bits */

	case ATOMISP_INPUT_FORMAT_RAW_12:		/* 2p, 3B, 24bits */