diff options
| author | Lad, Prabhakar <prabhakar.csengg@gmail.com> | 2014-03-22 07:57:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-04-16 18:23:45 -0300 |
| commit | 3d7543b9196cb0de8e65750f1da9ad155c22e12f (patch) | |
| tree | 36455d618d2c47ad628f5737092ed6af2efce043 /include/media/davinci | |
| parent | c8204930b21ea4d0a5504b40a73479ae318958dd (diff) | |
| download | linux-stable-3d7543b9196cb0de8e65750f1da9ad155c22e12f.tar.gz linux-stable-3d7543b9196cb0de8e65750f1da9ad155c22e12f.tar.bz2 linux-stable-3d7543b9196cb0de8e65750f1da9ad155c22e12f.zip | |
[media] media: davinci: vpbe: use v4l2_fh for priority handling
This patch migrates the vpbe driver to use v4l2_fh for
priority handling. This also fixes v4l2-compliance test.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/media/davinci')
| -rw-r--r-- | include/media/davinci/vpbe_display.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/media/davinci/vpbe_display.h b/include/media/davinci/vpbe_display.h index 8dffffedbb59..637749a91432 100644 --- a/include/media/davinci/vpbe_display.h +++ b/include/media/davinci/vpbe_display.h @@ -16,6 +16,7 @@ /* Header files */ #include <linux/videodev2.h> #include <media/v4l2-common.h> +#include <media/v4l2-fh.h> #include <media/videobuf2-dma-contig.h> #include <media/davinci/vpbe_types.h> #include <media/davinci/vpbe_osd.h> @@ -94,8 +95,6 @@ struct vpbe_layer { * has selected */ enum v4l2_memory memory; - /* Used to keep track of state of the priority */ - struct v4l2_prio_state prio; /* Used to store pixel format */ struct v4l2_pix_format pix_fmt; enum v4l2_field buf_field; @@ -134,14 +133,13 @@ struct vpbe_display { /* File handle structure */ struct vpbe_fh { + struct v4l2_fh fh; /* vpbe device structure */ struct vpbe_display *disp_dev; /* pointer to layer object for opened device */ struct vpbe_layer *layer; /* Indicates whether this file handle is doing IO */ unsigned char io_allowed; - /* Used to keep track priority of this instance */ - enum v4l2_priority prio; }; struct buf_config_params { |