These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / platform / vivid / vivid-core.h

diff --git a/kernel/drivers/media/platform/vivid/vivid-core.h b/kernel/drivers/media/platform/vivid/vivid-core.h
index 9e15aee..55b304a 100644 (file)
--- a/kernel/drivers/media/platform/vivid/vivid-core.h
+++ b/kernel/drivers/media/platform/vivid/vivid-core.h
@@ -21,7 +21,7 @@
 #define _VIVID_CORE_H_
 
 #include <linux/fb.h>
-#include <media/videobuf2-core.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-ctrls.h>
@@ -77,7 +77,6 @@ extern const struct v4l2_rect vivid_max_rect;
 extern unsigned vivid_debug;
 
 struct vivid_fmt {
-       const char *name;
        u32     fourcc;          /* v4l2 format id */
        bool    is_yuv;
        bool    can_do_overlay;
@@ -94,7 +93,7 @@ extern struct vivid_fmt vivid_formats[];
 /* buffer for one video frame */
 struct vivid_buffer {
        /* common v4l buffer stuff -- must be first */
-       struct vb2_buffer       vb;
+       struct vb2_v4l2_buffer vb;
        struct list_head        list;
 };
 
@@ -124,6 +123,7 @@ enum vivid_colorspace {
        VIVID_CS_SRGB,
        VIVID_CS_ADOBERGB,
        VIVID_CS_2020,
+       VIVID_CS_DCI_P3,
        VIVID_CS_240M,
        VIVID_CS_SYS_M,
        VIVID_CS_SYS_BG,
@@ -140,7 +140,7 @@ struct vivid_dev {
        struct v4l2_ctrl_handler        ctrl_hdl_user_aud;
        struct v4l2_ctrl_handler        ctrl_hdl_streaming;
        struct v4l2_ctrl_handler        ctrl_hdl_sdtv_cap;
-       struct v4l2_ctrl_handler        ctrl_hdl_loop_out;
+       struct v4l2_ctrl_handler        ctrl_hdl_loop_cap;
        struct video_device             vid_cap_dev;
        struct v4l2_ctrl_handler        ctrl_hdl_vid_cap;
        struct video_device             vid_out_dev;
@@ -333,6 +333,7 @@ struct vivid_dev {
        u32                             colorspace_out;
        u32                             ycbcr_enc_out;
        u32                             quantization_out;
+       u32                             xfer_func_out;
        u32                             service_set_out;
        unsigned                        bytesperline_out[TPG_MAX_PLANES];
        unsigned                        tv_field_out;
@@ -447,8 +448,11 @@ struct vivid_dev {
        /* SDR capture */
        struct vb2_queue                vb_sdr_cap_q;
        struct list_head                sdr_cap_active;
+       u32                             sdr_pixelformat; /* v4l2 format id */
+       unsigned                        sdr_buffersize;
        unsigned                        sdr_adc_freq;
        unsigned                        sdr_fm_freq;
+       unsigned                        sdr_fm_deviation;
        int                             sdr_fixp_src_phase;
        int                             sdr_fixp_mod_phase;