Commit 1282033f authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: drop IA_CSS_FRAME_FORMAT_MIPI support from ia_css_frame_init_planes() 

Nothing ever sets the format to IA_CSS_FRAME_FORMAT_MIPI and
frame_init_mipi_plane() is the only code-path which ever sets
frame->contiguous to true.

Drop A_CSS_FRAME_FORMAT_MIPI support from ia_css_frame_init_planes()
as part of the removal of contiguous alloc support from the frame code.

Link: https://lore.kernel.org/linux-media/20220615205037.16549-7-hdegoede@redhat.com


Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent dc65da4f

drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c

+3 −27
Original line number Diff line number Diff line
@@ -48,12 +48,6 @@ static void frame_init_raw_single_plane( 
    unsigned int subpixels_per_line,

    unsigned int bits_per_pixel);



static void frame_init_mipi_plane(struct ia_css_frame *frame,

				  struct ia_css_frame_plane *plane,

				  unsigned int height,

				  unsigned int subpixels_per_line,

				  unsigned int bytes_per_pixel);



static void frame_init_nv_planes(struct ia_css_frame *frame,

				 unsigned int horizontal_decimation,

				 unsigned int vertical_decimation,
@@ -297,11 +291,9 @@ int ia_css_frame_init_planes(struct ia_css_frame *frame) 


	switch (frame->info.format) {

	case IA_CSS_FRAME_FORMAT_MIPI:

		frame_init_mipi_plane(frame, &frame->planes.raw,

				      frame->info.res.height,

				      frame->info.padded_width,

				      frame->info.raw_bit_depth <= 8 ? 1 : 2);

		break;

		dev_err(atomisp_dev,

			"%s: unexpected use of IA_CSS_FRAME_FORMAT_MIPI\n", __func__);

		return -EINVAL;

	case IA_CSS_FRAME_FORMAT_RAW_PACKED:

		frame_init_raw_single_plane(frame, &frame->planes.raw,

					    frame->info.res.height,
@@ -622,22 +614,6 @@ static void frame_init_raw_single_plane( 
	return;

}



static void frame_init_mipi_plane(struct ia_css_frame *frame,

				  struct ia_css_frame_plane *plane,

				  unsigned int height,

				  unsigned int subpixels_per_line,

				  unsigned int bytes_per_pixel)

{

	unsigned int stride;



	stride = subpixels_per_line * bytes_per_pixel;

	frame->data_bytes = 8388608; /* 8*1024*1024 */

	frame->valid = false;

	frame->contiguous = true;

	frame_init_plane(plane, subpixels_per_line, stride, height, 0);

	return;

}



static void frame_init_nv_planes(struct ia_css_frame *frame,

				 unsigned int horizontal_decimation,

				 unsigned int vertical_decimation,