Commit 945b07b1 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: vivid: add mc 



Add support for the media_device to vivid. This is a prerequisite
for request support.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 86b93b2c

drivers/media/platform/vivid/vivid-core.c

+61 −0
Original line number Diff line number Diff line
@@ -657,6 +657,15 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) 


	dev->inst = inst;



#ifdef CONFIG_MEDIA_CONTROLLER

	dev->v4l2_dev.mdev = &dev->mdev;



	/* Initialize media device */

	strlcpy(dev->mdev.model, VIVID_MODULE_NAME, sizeof(dev->mdev.model));

	dev->mdev.dev = &pdev->dev;

	media_device_init(&dev->mdev);

#endif



	/* register v4l2_device */

	snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name),

			"%s-%03d", VIVID_MODULE_NAME, inst);
@@ -1174,6 +1183,13 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) 
		vfd->lock = &dev->mutex;

		video_set_drvdata(vfd, dev);



#ifdef CONFIG_MEDIA_CONTROLLER

		dev->vid_cap_pad.flags = MEDIA_PAD_FL_SINK;

		ret = media_entity_pads_init(&vfd->entity, 1, &dev->vid_cap_pad);

		if (ret)

			goto unreg_dev;

#endif



#ifdef CONFIG_VIDEO_VIVID_CEC

		if (in_type_counter[HDMI]) {

			struct cec_adapter *adap;
@@ -1226,6 +1242,13 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) 
		vfd->lock = &dev->mutex;

		video_set_drvdata(vfd, dev);



#ifdef CONFIG_MEDIA_CONTROLLER

		dev->vid_out_pad.flags = MEDIA_PAD_FL_SOURCE;

		ret = media_entity_pads_init(&vfd->entity, 1, &dev->vid_out_pad);

		if (ret)

			goto unreg_dev;

#endif



#ifdef CONFIG_VIDEO_VIVID_CEC

		for (i = 0; i < dev->num_outputs; i++) {

			struct cec_adapter *adap;
@@ -1275,6 +1298,13 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) 
		vfd->tvnorms = tvnorms_cap;

		video_set_drvdata(vfd, dev);



#ifdef CONFIG_MEDIA_CONTROLLER

		dev->vbi_cap_pad.flags = MEDIA_PAD_FL_SINK;

		ret = media_entity_pads_init(&vfd->entity, 1, &dev->vbi_cap_pad);

		if (ret)

			goto unreg_dev;

#endif



		ret = video_register_device(vfd, VFL_TYPE_VBI, vbi_cap_nr[inst]);

		if (ret < 0)

			goto unreg_dev;
@@ -1300,6 +1330,13 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) 
		vfd->tvnorms = tvnorms_out;

		video_set_drvdata(vfd, dev);



#ifdef CONFIG_MEDIA_CONTROLLER

		dev->vbi_out_pad.flags = MEDIA_PAD_FL_SOURCE;

		ret = media_entity_pads_init(&vfd->entity, 1, &dev->vbi_out_pad);

		if (ret)

			goto unreg_dev;

#endif



		ret = video_register_device(vfd, VFL_TYPE_VBI, vbi_out_nr[inst]);

		if (ret < 0)

			goto unreg_dev;
@@ -1323,6 +1360,13 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) 
		vfd->lock = &dev->mutex;

		video_set_drvdata(vfd, dev);



#ifdef CONFIG_MEDIA_CONTROLLER

		dev->sdr_cap_pad.flags = MEDIA_PAD_FL_SINK;

		ret = media_entity_pads_init(&vfd->entity, 1, &dev->sdr_cap_pad);

		if (ret)

			goto unreg_dev;

#endif



		ret = video_register_device(vfd, VFL_TYPE_SDR, sdr_cap_nr[inst]);

		if (ret < 0)

			goto unreg_dev;
@@ -1369,12 +1413,25 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) 
					  video_device_node_name(vfd));

	}



#ifdef CONFIG_MEDIA_CONTROLLER

	/* Register the media device */

	ret = media_device_register(&dev->mdev);

	if (ret) {

		dev_err(dev->mdev.dev,

			"media device register failed (err=%d)\n", ret);

		goto unreg_dev;

	}

#endif



	/* Now that everything is fine, let's add it to device list */

	vivid_devs[inst] = dev;



	return 0;



unreg_dev:

#ifdef CONFIG_MEDIA_CONTROLLER

	media_device_unregister(&dev->mdev);

#endif

	video_unregister_device(&dev->radio_tx_dev);

	video_unregister_device(&dev->radio_rx_dev);

	video_unregister_device(&dev->sdr_cap_dev);
@@ -1445,6 +1502,10 @@ static int vivid_remove(struct platform_device *pdev) 
		if (!dev)

			continue;



#ifdef CONFIG_MEDIA_CONTROLLER

		media_device_unregister(&dev->mdev);

#endif



		if (dev->has_vid_cap) {

			v4l2_info(&dev->v4l2_dev, "unregistering %s\n",

				video_device_node_name(&dev->vid_cap_dev));

drivers/media/platform/vivid/vivid-core.h

+8 −0
Original line number Diff line number Diff line
@@ -136,6 +136,14 @@ struct vivid_cec_work { 
struct vivid_dev {

	unsigned			inst;

	struct v4l2_device		v4l2_dev;

#ifdef CONFIG_MEDIA_CONTROLLER

	struct media_device		mdev;

	struct media_pad		vid_cap_pad;

	struct media_pad		vid_out_pad;

	struct media_pad		vbi_cap_pad;

	struct media_pad		vbi_out_pad;

	struct media_pad		sdr_cap_pad;

#endif

	struct v4l2_ctrl_handler	ctrl_hdl_user_gen;

	struct v4l2_ctrl_handler	ctrl_hdl_user_vid;

	struct v4l2_ctrl_handler	ctrl_hdl_user_aud;