[media] v4l2: use new flag to enable core priority handling (b1a873a3) · Commits · 戴 / test

Documentation/video4linux/v4l2-framework.txt

+6 −1

Original line number	Diff line number	Diff line
		@@ -577,6 +577,10 @@ You should also set these fields:
		(cx8802). Since the v4l2_device cannot be associated with a particular
		PCI device it is setup without a parent device. But when the struct
		video_device is setup you do know which parent PCI device to use.
		- flags: optional. Set to V4L2_FL_USE_FH_PRIO if you want to let the framework
		handle the VIDIOC_G/S_PRIORITY ioctls. This requires that you use struct
		v4l2_fh. Eventually this flag will disappear once all drivers use the core
		priority handling. But for now it has to be set explicitly.

		If you use v4l2_ioctl_ops, then you should set .unlocked_ioctl to video_ioctl2
		in your v4l2_file_operations struct.
		@@ -775,7 +779,8 @@ struct v4l2_fh

		struct v4l2_fh provides a way to easily keep file handle specific data
		that is used by the V4L2 framework. New drivers must use struct v4l2_fh
		since it is also used to implement priority handling (VIDIOC_G/S_PRIORITY).
		since it is also used to implement priority handling (VIDIOC_G/S_PRIORITY)
		if the video_device flag V4L2_FL_USE_FH_PRIO is also set.

		The users of v4l2_fh (in the V4L2 framework, not the driver) know
		whether a driver uses v4l2_fh as its file->private_data pointer by

+1 −0

Original line number	Diff line number	Diff line
		@@ -207,6 +207,7 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
		s->video_dev->fops = &cx18_v4l2_enc_fops;
		s->video_dev->release = video_device_release;
		s->video_dev->tvnorms = V4L2_STD_ALL;
		set_bit(V4L2_FL_USE_FH_PRIO, &s->video_dev->flags);
		cx18_set_funcs(s->video_dev);
		return 0;
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,7 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
		s->vdev->fops = ivtv_stream_info[type].fops;
		s->vdev->release = video_device_release;
		s->vdev->tvnorms = V4L2_STD_ALL;
		set_bit(V4L2_FL_USE_FH_PRIO, &s->vdev->flags);
		ivtv_set_funcs(s->vdev);
		return 0;
		}

+3 −5

Original line number	Diff line number	Diff line
		@@ -578,11 +578,9 @@ int __video_register_device(struct video_device *vdev, int type, int nr,
		vdev->parent = vdev->v4l2_dev->dev;
		if (vdev->ctrl_handler == NULL)
		vdev->ctrl_handler = vdev->v4l2_dev->ctrl_handler;
		/* If the prio state pointer is NULL, and if the driver doesn't
		handle priorities itself, then use the v4l2_device prio
		state. */
		if (vdev->prio == NULL && vdev->ioctl_ops &&
		vdev->ioctl_ops->vidioc_s_priority == NULL)
		/* If the prio state pointer is NULL, then use the v4l2_device
		prio state. */
		if (vdev->prio == NULL)
		vdev->prio = &vdev->v4l2_dev->prio;
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ int v4l2_fh_init(struct v4l2_fh fh, struct video_device vdev)
		INIT_LIST_HEAD(&fh->list);
		set_bit(V4L2_FL_USES_V4L2_FH, &fh->vdev->flags);
		fh->prio = V4L2_PRIORITY_UNSET;
		BUG_ON(vdev->prio == NULL);

		/*
		* fh->events only needs to be initialized if the driver
		@@ -54,6 +53,7 @@ void v4l2_fh_add(struct v4l2_fh *fh)
		{
		unsigned long flags;

		if (test_bit(V4L2_FL_USE_FH_PRIO, &fh->vdev->flags))
		v4l2_prio_open(fh->vdev->prio, &fh->prio);
		spin_lock_irqsave(&fh->vdev->fh_lock, flags);
		list_add(&fh->list, &fh->vdev->fh_list);
		@@ -82,6 +82,7 @@ void v4l2_fh_del(struct v4l2_fh *fh)
		spin_lock_irqsave(&fh->vdev->fh_lock, flags);
		list_del_init(&fh->list);
		spin_unlock_irqrestore(&fh->vdev->fh_lock, flags);
		if (test_bit(V4L2_FL_USE_FH_PRIO, &fh->vdev->flags))
		v4l2_prio_close(fh->vdev->prio, fh->prio);
		}
		EXPORT_SYMBOL_GPL(v4l2_fh_del);