Commit 23780e14 authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Mauro Carvalho Chehab
Browse files

media: staging: rkisp1: cap: move code that manages the buffers to rkisp1_set_next_buf 



The function 'rkisp1_set_next_buf' configures the registers
according to 'cap->buf.next'. It is called after updating
'cap->buf.next' and 'cap->buf.curr'. This patch moves the
code that updates those fields to rkisp1_set_next_buf.
This is a preparation for later patch that change a call to
'rkisp1_handle_buffer' with a call to 'rkisp1_set_next_buf'.

Signed-off-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: default avatarHelen Koike <helen.koike@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 454748e3

drivers/staging/media/rkisp1/rkisp1-capture.c

+14 −16
Original line number Diff line number Diff line
@@ -575,12 +575,16 @@ static void rkisp1_dummy_buf_destroy(struct rkisp1_capture *cap) 


static void rkisp1_set_next_buf(struct rkisp1_capture *cap)

{

	/*

	 * Use the dummy space allocated by dma_alloc_coherent to

	 * throw data if there is no available buffer.

	 */

	if (cap->buf.next) {

		u32 *buff_addr = cap->buf.next->buff_addr;

	cap->buf.curr = cap->buf.next;

	cap->buf.next = NULL;



	if (!list_empty(&cap->buf.queue)) {

		u32 *buff_addr;



		cap->buf.next = list_first_entry(&cap->buf.queue, struct rkisp1_buffer, queue);

		list_del(&cap->buf.next->queue);



		buff_addr = cap->buf.next->buff_addr;



		rkisp1_write(cap->rkisp1,

			     buff_addr[RKISP1_PLANE_Y],
@@ -592,6 +596,10 @@ static void rkisp1_set_next_buf(struct rkisp1_capture *cap) 
			     buff_addr[RKISP1_PLANE_CR],

			     cap->config->mi.cr_base_ad_init);

	} else {

		/*

		 * Use the dummy space allocated by dma_alloc_coherent to

		 * throw data if there is no available buffer.

		 */

		rkisp1_write(cap->rkisp1,

			     cap->buf.dummy.dma_addr,

			     cap->config->mi.y_base_ad_init);
@@ -632,16 +640,6 @@ static void rkisp1_handle_buffer(struct rkisp1_capture *cap) 
		cap->rkisp1->debug.frame_drop[cap->id]++;

	}



	cap->buf.curr = cap->buf.next;

	cap->buf.next = NULL;



	if (!list_empty(&cap->buf.queue)) {

		cap->buf.next = list_first_entry(&cap->buf.queue,

						 struct rkisp1_buffer,

						 queue);

		list_del(&cap->buf.next->queue);

	}



	rkisp1_set_next_buf(cap);

	spin_unlock_irqrestore(&cap->buf.lock, flags);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE