[media] s5p-fimc: Add media operations in the capture entity driver
authorSylwester Nawrocki <s.nawrocki@samsung.com>
Wed, 24 Aug 2011 22:28:18 +0000 (19:28 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 6 Sep 2011 20:40:04 +0000 (17:40 -0300)
Add the link_setup handler for the camera capture video node.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/s5p-fimc/fimc-capture.c
drivers/media/video/s5p-fimc/fimc-core.h

index 0c237a776f8db5fd57c9b382c692c780e07049c1..95996fb91a12f70bba6844daa905553489e1e4a1 100644 (file)
@@ -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;
 
index 1825e339fa35ff48929c20d298fc3b697a2ff8f7..87a89f1a81ba2fc2e1039dc7c44644d075911811 100644 (file)
@@ -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;
 };