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

Commit 954f340f authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] Set vfl_dir for all display or m2m drivers 



Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5c77879f

drivers/media/pci/ivtv/ivtv-streams.c

+3 −0
Original line number Diff line number Diff line
@@ -222,6 +222,9 @@ static int ivtv_prep_dev(struct ivtv *itv, int type) 


	s->vdev->num = num;

	s->vdev->v4l2_dev = &itv->v4l2_dev;

	if (ivtv_stream_info[type].v4l2_caps &

			(V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_SLICED_VBI_OUTPUT))

		s->vdev->vfl_dir = VFL_DIR_TX;

	s->vdev->fops = ivtv_stream_info[type].fops;

	s->vdev->ctrl_handler = itv->v4l2_dev.ctrl_handler;

	s->vdev->release = video_device_release;

drivers/media/pci/zoran/zoran_card.c

+4 −0
Original line number Diff line number Diff line
@@ -1055,6 +1055,10 @@ zr36057_init (struct zoran *zr) 
	memcpy(zr->video_dev, &zoran_template, sizeof(zoran_template));

	zr->video_dev->parent = &zr->pci_dev->dev;

	strcpy(zr->video_dev->name, ZR_DEVNAME(zr));

	/* It's not a mem2mem device, but you can both capture and output from

	   one and the same device. This should really be split up into two

	   device nodes, but that's a job for another day. */

	zr->video_dev->vfl_dir = VFL_DIR_M2M;

	err = video_register_device(zr->video_dev, VFL_TYPE_GRABBER, video_nr[zr->id]);

	if (err < 0)

		goto exit_free;

drivers/media/platform/coda.c

+1 −0
Original line number Diff line number Diff line
@@ -1639,6 +1639,7 @@ static void coda_fw_callback(const struct firmware *fw, void *context) 
	dev->vfd.release	= video_device_release_empty,

	dev->vfd.lock	= &dev->dev_mutex;

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

	dev->vfd.vfl_dir	= VFL_DIR_M2M;

	snprintf(dev->vfd.name, sizeof(dev->vfd.name), "%s", CODA_NAME);

	video_set_drvdata(&dev->vfd, dev);

drivers/media/platform/davinci/vpbe_display.c

+1 −0
Original line number Diff line number Diff line
@@ -1633,6 +1633,7 @@ static __devinit int init_vpbe_layer(int i, struct vpbe_display *disp_dev, 
	vbd->minor	= -1;

	vbd->v4l2_dev   = &disp_dev->vpbe_dev->v4l2_dev;

	vbd->lock	= &vpbe_display_layer->opslock;

	vbd->vfl_dir	= VFL_DIR_TX;



	if (disp_dev->vpbe_dev->current_timings.timings_type &

			VPBE_ENC_STD) {

drivers/media/platform/davinci/vpif_display.c

+1 −0
Original line number Diff line number Diff line
@@ -1745,6 +1745,7 @@ static __init int vpif_probe(struct platform_device *pdev) 
		*vfd = vpif_video_template;

		vfd->v4l2_dev = &vpif_obj.v4l2_dev;

		vfd->release = video_device_release;

		vfd->vfl_dir = VFL_DIR_TX;

		snprintf(vfd->name, sizeof(vfd->name),

			 "VPIF_Display_DRIVER_V%s",

			 VPIF_DISPLAY_VERSION);