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

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

[media] s5p-fimc: Add media operations in the capture entity driver 



Add the link_setup handler for the camera capture video node.

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 131b6c61

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

+32 −0
Original line number Diff line number Diff line
@@ -669,6 +669,37 @@ static const struct v4l2_ioctl_ops fimc_capture_ioctl_ops = { 
	.vidioc_g_input			= fimc_cap_g_input,

};



/* Media operations */

static int fimc_link_setup(struct media_entity *entity,

			   const struct media_pad *local,

			   const struct media_pad *remote, u32 flags)

{

	struct video_device *vd = media_entity_to_video_device(entity);

	struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(remote->entity);

	struct fimc_dev *fimc = video_get_drvdata(vd);



	if (WARN_ON(fimc == NULL))

		return 0;



	dbg("%s --> %s, flags: 0x%x. input: 0x%x",

	    local->entity->name, remote->entity->name, flags,

	    fimc->vid_cap.input);



	if (flags & MEDIA_LNK_FL_ENABLED) {

		if (fimc->vid_cap.input != 0)

			return -EBUSY;

		fimc->vid_cap.input = sd->grp_id;

		return 0;

	}



	fimc->vid_cap.input = 0;

	return 0;

}



static const struct media_entity_operations fimc_media_ops = {

	.link_setup = fimc_link_setup,

};



/* fimc->lock must be already initialized */

int fimc_register_capture_device(struct fimc_dev *fimc,

				 struct v4l2_device *v4l2_dev)
@@ -743,6 +774,7 @@ int fimc_register_capture_device(struct fimc_dev *fimc, 
	if (ret)

		goto err_ent;



	vfd->entity.ops = &fimc_media_ops;

	vfd->ctrl_handler = &ctx->ctrl_handler;

	return 0;

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

+2 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ struct fimc_m2m_device { 
 * @reqbufs_count: the number of buffers requested in REQBUFS ioctl

 * @input_index: input (camera sensor) index

 * @refcnt: driver's private reference counter

 * @input: capture input type, grp_id of the attached subdev

 * @user_subdev_api: true if subdevs are not configured by the host driver

 */

struct fimc_vid_cap {
@@ -323,6 +324,7 @@ struct fimc_vid_cap { 
	unsigned int			reqbufs_count;

	int				input_index;

	int				refcnt;

	u32				input;

	bool				user_subdev_api;

};