Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97d97422 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-fimc: Move m2m node driver into separate file 



Virtually no functional changes, just code reordering. This let us to
clearly separate all logical functions available in the driver: fimc
capture, mem-to-mem, and later fimc-lite capture, ISP features, etc.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 41df5bf0

drivers/media/video/s5p-fimc/Makefile

+1 −1
Original line number Diff line number Diff line 
s5p-fimc-objs := fimc-core.o fimc-reg.o fimc-capture.o fimc-mdevice.o

s5p-fimc-objs := fimc-core.o fimc-reg.o fimc-m2m.o fimc-capture.o fimc-mdevice.o

s5p-csis-objs := mipi-csis.o



obj-$(CONFIG_VIDEO_S5P_MIPI_CSIS)	+= s5p-csis.o

drivers/media/video/s5p-fimc/fimc-capture.c

+66 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static int fimc_stop_capture(struct fimc_dev *fimc, bool suspend) 
 * spinlock held. It updates the camera pixel crop, rotation and

 * image flip in H/W.

 */

int fimc_capture_config_update(struct fimc_ctx *ctx)

static int fimc_capture_config_update(struct fimc_ctx *ctx)

{

	struct fimc_dev *fimc = ctx->fimc_dev;

	int ret;
@@ -166,6 +166,70 @@ int fimc_capture_config_update(struct fimc_ctx *ctx) 
	return ret;

}



void fimc_capture_irq_handler(struct fimc_dev *fimc, int deq_buf)

{

	struct fimc_vid_cap *cap = &fimc->vid_cap;

	struct fimc_vid_buffer *v_buf;

	struct timeval *tv;

	struct timespec ts;



	if (test_and_clear_bit(ST_CAPT_SHUT, &fimc->state)) {

		wake_up(&fimc->irq_queue);

		goto done;

	}



	if (!list_empty(&cap->active_buf_q) &&

	    test_bit(ST_CAPT_RUN, &fimc->state) && deq_buf) {

		ktime_get_real_ts(&ts);



		v_buf = fimc_active_queue_pop(cap);



		tv = &v_buf->vb.v4l2_buf.timestamp;

		tv->tv_sec = ts.tv_sec;

		tv->tv_usec = ts.tv_nsec / NSEC_PER_USEC;

		v_buf->vb.v4l2_buf.sequence = cap->frame_count++;



		vb2_buffer_done(&v_buf->vb, VB2_BUF_STATE_DONE);

	}



	if (!list_empty(&cap->pending_buf_q)) {



		v_buf = fimc_pending_queue_pop(cap);

		fimc_hw_set_output_addr(fimc, &v_buf->paddr, cap->buf_index);

		v_buf->index = cap->buf_index;



		/* Move the buffer to the capture active queue */

		fimc_active_queue_add(cap, v_buf);



		dbg("next frame: %d, done frame: %d",

		    fimc_hw_get_frame_index(fimc), v_buf->index);



		if (++cap->buf_index >= FIMC_MAX_OUT_BUFS)

			cap->buf_index = 0;

	}



	if (cap->active_buf_cnt == 0) {

		if (deq_buf)

			clear_bit(ST_CAPT_RUN, &fimc->state);



		if (++cap->buf_index >= FIMC_MAX_OUT_BUFS)

			cap->buf_index = 0;

	} else {

		set_bit(ST_CAPT_RUN, &fimc->state);

	}



	fimc_capture_config_update(cap->ctx);

done:

	if (cap->active_buf_cnt == 1) {

		fimc_deactivate_capture(fimc);

		clear_bit(ST_CAPT_STREAM, &fimc->state);

	}



	dbg("frame: %d, active_buf_cnt: %d",

	    fimc_hw_get_frame_index(fimc), cap->active_buf_cnt);

}





static int start_streaming(struct vb2_queue *q, unsigned int count)

{

	struct fimc_ctx *ctx = q->drv_priv;
@@ -1245,7 +1309,7 @@ void fimc_sensor_notify(struct v4l2_subdev *sd, unsigned int notification, 
					 struct fimc_vid_buffer, list);

			vb2_set_plane_payload(&buf->vb, 0, *((u32 *)arg));

		}

		fimc_capture_irq_handler(fimc, true);

		fimc_capture_irq_handler(fimc, 1);

		fimc_deactivate_capture(fimc);

		spin_unlock_irqrestore(&fimc->slock, irq_flags);

	}

drivers/media/video/s5p-fimc/fimc-core.c

+9 −850

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/video/s5p-fimc/fimc-core.h

+6 −4
Original line number Diff line number Diff line
@@ -712,6 +712,7 @@ void fimc_adjust_mplane_format(struct fimc_fmt *fmt, u32 width, u32 height, 
			       struct v4l2_pix_format_mplane *pix);

struct fimc_fmt *fimc_find_format(const u32 *pixelformat, const u32 *mbus_code,

				  unsigned int mask, int index);

struct fimc_fmt *fimc_get_format(unsigned int index);



int fimc_check_scaler_ratio(struct fimc_ctx *ctx, int sw, int sh,

			    int dw, int dh, int rotation);
@@ -722,7 +723,7 @@ int fimc_prepare_addr(struct fimc_ctx *ctx, struct vb2_buffer *vb, 
void fimc_prepare_dma_offset(struct fimc_ctx *ctx, struct fimc_frame *f);

void fimc_set_yuv_order(struct fimc_ctx *ctx);

void fimc_fill_frame(struct fimc_frame *frame, struct v4l2_format *f);

void fimc_capture_irq_handler(struct fimc_dev *fimc, bool done);

void fimc_capture_irq_handler(struct fimc_dev *fimc, int deq_buf);



int fimc_register_m2m_device(struct fimc_dev *fimc,

			     struct v4l2_device *v4l2_dev);
@@ -730,19 +731,20 @@ void fimc_unregister_m2m_device(struct fimc_dev *fimc); 
int fimc_register_driver(void);

void fimc_unregister_driver(void);



/* -----------------------------------------------------*/

/* fimc-m2m.c */

void fimc_m2m_job_finish(struct fimc_ctx *ctx, int vb_state);



/* -----------------------------------------------------*/

/* fimc-capture.c					*/

int fimc_register_capture_device(struct fimc_dev *fimc,

				 struct v4l2_device *v4l2_dev);

void fimc_unregister_capture_device(struct fimc_dev *fimc);

int fimc_capture_ctrls_create(struct fimc_dev *fimc);

int fimc_vid_cap_buf_queue(struct fimc_dev *fimc,

			     struct fimc_vid_buffer *fimc_vb);

void fimc_sensor_notify(struct v4l2_subdev *sd, unsigned int notification,

			void *arg);

int fimc_capture_suspend(struct fimc_dev *fimc);

int fimc_capture_resume(struct fimc_dev *fimc);

int fimc_capture_config_update(struct fimc_ctx *ctx);



/* Locking: the caller holds fimc->slock */

static inline void fimc_activate_capture(struct fimc_ctx *ctx)

drivers/media/video/s5p-fimc/fimc-m2m.c

0 → 100644
+812 −0

File added.

Preview size limit exceeded, changes collapsed.