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

Commit 3bdaa382 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[media] media: davinci: vpfe: use v4l2_fh for priority handling 



This patch migrates the vpfe driver to use v4l2_fh for
priority handling.

Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 3d7543b9

drivers/media/platform/davinci/vpfe_capture.c

+6 −7
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ unlock: 
static int vpfe_open(struct file *file)

{

	struct vpfe_device *vpfe_dev = video_drvdata(file);

	struct video_device *vdev = video_devdata(file);

	struct vpfe_fh *fh;



	v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_open\n");
@@ -517,6 +518,7 @@ static int vpfe_open(struct file *file) 
	/* store pointer to fh in private_data member of file */

	file->private_data = fh;

	fh->vpfe_dev = vpfe_dev;

	v4l2_fh_init(&fh->fh, vdev);

	mutex_lock(&vpfe_dev->lock);

	/* If decoder is not initialized. initialize it */

	if (!vpfe_dev->initialized) {
@@ -529,9 +531,7 @@ static int vpfe_open(struct file *file) 
	vpfe_dev->usrs++;

	/* Set io_allowed member to false */

	fh->io_allowed = 0;

	/* Initialize priority of this instance to default priority */

	fh->prio = V4L2_PRIORITY_UNSET;

	v4l2_prio_open(&vpfe_dev->prio, &fh->prio);

	v4l2_fh_add(&fh->fh);

	mutex_unlock(&vpfe_dev->lock);

	return 0;

}
@@ -740,8 +740,8 @@ static int vpfe_release(struct file *file) 


	/* Decrement device usrs counter */

	vpfe_dev->usrs--;

	/* Close the priority */

	v4l2_prio_close(&vpfe_dev->prio, fh->prio);

	v4l2_fh_del(&fh->fh);

	v4l2_fh_exit(&fh->fh);

	/* If this is the last file handle */

	if (!vpfe_dev->usrs) {

		vpfe_dev->initialized = 0;
@@ -1910,14 +1910,13 @@ static int vpfe_probe(struct platform_device *pdev) 
	/* Initialize field of the device objects */

	vpfe_dev->numbuffers = config_params.numbuffers;



	/* Initialize prio member of device object */

	v4l2_prio_init(&vpfe_dev->prio);

	/* register video device */

	v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev,

		"trying to register vpfe device.\n");

	v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev,

		"video_dev=%x\n", (int)&vpfe_dev->video_dev);

	vpfe_dev->fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

	set_bit(V4L2_FL_USE_FH_PRIO, &vpfe_dev->video_dev->flags);

	ret = video_register_device(vpfe_dev->video_dev,

				    VFL_TYPE_GRABBER, -1);

include/media/davinci/vpfe_capture.h

+2 −4
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/videodev2.h>

#include <linux/clk.h>

#include <linux/i2c.h>

#include <media/v4l2-fh.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-device.h>

#include <media/videobuf-dma-contig.h>
@@ -110,8 +111,6 @@ struct vpfe_device { 
	struct v4l2_device v4l2_dev;

	/* parent device */

	struct device *pdev;

	/* Used to keep track of state of the priority */

	struct v4l2_prio_state prio;

	/* number of open instances of the channel */

	u32 usrs;

	/* Indicates id of the field which is being displayed */
@@ -174,11 +173,10 @@ struct vpfe_device { 


/* File handle structure */

struct vpfe_fh {

	struct v4l2_fh fh;

	struct vpfe_device *vpfe_dev;

	/* Indicates whether this file handle is doing IO */

	u8 io_allowed;

	/* Used to keep track priority of this instance */

	enum v4l2_priority prio;

};



struct vpfe_config_params {