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

media: atomisp: drop contiguous flag from struct ia_css_frame 

Drop the contiguous flag from struct ia_css_frame, it is always false /
not used.

Link: https://lore.kernel.org/linux-media/20220615205037.16549-8-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 1282033f

drivers/staging/media/atomisp/pci/ia_css_frame_public.h

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ struct ia_css_frame { 
	/** exposure id, see ia_css_event_public.h for more detail */

	u32 isp_config_id; /** Unique ID to track which config was actually applied to a particular frame */

	bool valid; /** First video output frame is not valid */

	bool contiguous; /** memory is allocated physically contiguously */

	union {

		unsigned int	_initialisation_dummy;

		struct ia_css_frame_plane raw;

drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c

+0 −2
Original line number Diff line number Diff line
@@ -1305,8 +1305,6 @@ void ia_css_debug_frame_print(const struct ia_css_frame *frame, 
	ia_css_debug_dtrace(2, "  padded width  = %d\n",

			    frame->info.padded_width);

	ia_css_debug_dtrace(2, "  format        = %d\n", frame->info.format);

	ia_css_debug_dtrace(2, "  is contiguous = %s\n",

			    frame->contiguous ? "yes" : "no");

	switch (frame->info.format) {

	case IA_CSS_FRAME_FORMAT_NV12:

	case IA_CSS_FRAME_FORMAT_NV16:

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

+1 −5
Original line number Diff line number Diff line
@@ -732,10 +732,7 @@ static int frame_allocate_buffer_data(struct ia_css_frame *frame) 
	IA_CSS_ENTER_LEAVE_PRIVATE("frame->data_bytes=%d\n", frame->data_bytes);

#endif

	frame->data = hmm_alloc(frame->data_bytes,

				HMM_BO_PRIVATE, 0, NULL,

				frame->contiguous ?

				ATOMISP_MAP_FLAG_CONTIGUOUS : 0);



				HMM_BO_PRIVATE, 0, NULL, 0);

	if (frame->data == mmgr_NULL)

		return -ENOMEM;

	return 0;
@@ -796,7 +793,6 @@ static struct ia_css_frame *frame_create(unsigned int width, 
	me->info.format = format;

	me->info.padded_width = padded_width;

	me->info.raw_bit_depth = raw_bit_depth;

	me->contiguous = false;

	me->valid = valid;

	me->data_bytes = 0;

	me->data = mmgr_NULL;

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

+0 −5
Original line number Diff line number Diff line
@@ -3061,7 +3061,6 @@ init_vf_frameinfo_defaults(struct ia_css_pipe *pipe, 
	assert(vf_frame);



	sh_css_pipe_get_viewfinder_frame_info(pipe, &vf_frame->info, idx);

	vf_frame->contiguous = false;

	vf_frame->flash_state = IA_CSS_FRAME_FLASH_STATE_NONE;

	ia_css_pipeline_get_sp_thread_id(ia_css_pipe_get_pipe_num(pipe), &thread_id);

	ia_css_query_internal_queue_id(IA_CSS_BUFFER_TYPE_VF_OUTPUT_FRAME + idx, thread_id, &queue_id);
@@ -3243,7 +3242,6 @@ init_in_frameinfo_memory_defaults(struct ia_css_pipe *pipe, 
	in_frame->info.raw_bit_depth =

	ia_css_pipe_util_pipe_input_format_bpp(pipe);

	ia_css_frame_info_set_width(&in_frame->info, pipe->stream->config.input_config.input_res.width, 0);

	in_frame->contiguous = false;

	in_frame->flash_state = IA_CSS_FRAME_FLASH_STATE_NONE;

	ia_css_pipeline_get_sp_thread_id(ia_css_pipe_get_pipe_num(pipe), &thread_id);

	ia_css_query_internal_queue_id(IA_CSS_BUFFER_TYPE_INPUT_FRAME, thread_id, &queue_id);
@@ -3271,7 +3269,6 @@ init_out_frameinfo_defaults(struct ia_css_pipe *pipe, 
	assert(out_frame);



	sh_css_pipe_get_output_frame_info(pipe, &out_frame->info, idx);

	out_frame->contiguous = false;

	out_frame->flash_state = IA_CSS_FRAME_FLASH_STATE_NONE;

	ia_css_pipeline_get_sp_thread_id(ia_css_pipe_get_pipe_num(pipe), &thread_id);

	ia_css_query_internal_queue_id(IA_CSS_BUFFER_TYPE_OUTPUT_FRAME + idx, thread_id, &queue_id);
@@ -7158,7 +7155,6 @@ create_host_copy_pipeline(struct ia_css_pipe *pipe, 
	ia_css_pipeline_clean(me);



	/* Construct out_frame info */

	out_frame->contiguous = false;

	out_frame->flash_state = IA_CSS_FRAME_FLASH_STATE_NONE;



	if (copy_on_sp(pipe) &&
@@ -7208,7 +7204,6 @@ create_host_isyscopy_capture_pipeline(struct ia_css_pipe *pipe) 
	err = sh_css_pipe_get_output_frame_info(pipe, &out_frame->info, 0);

	if (err)

		return err;

	out_frame->contiguous = false;

	out_frame->flash_state = IA_CSS_FRAME_FLASH_STATE_NONE;

	ia_css_pipeline_get_sp_thread_id(ia_css_pipe_get_pipe_num(pipe), &thread_id);

	ia_css_query_internal_queue_id(IA_CSS_BUFFER_TYPE_OUTPUT_FRAME, thread_id, &queue_id);