CHROMIUM: [media] rockchip-vpu: fix compile errors

Adjust to new v4l2 APIs and fix some debug logs.

Change-Id: Iafba102fa326c669efcbb0baeb8897fe660dcdd4
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Yakir Yang <ykk@rock-chips.com>

diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu.c
index ac35b0cf96655dc20f1ef817abddbcbde2e00faa..5a4520c46a735cd61d457ba08ec27c6e5ee5123a 100644 (file)
--- a/drivers/media/platform/rockchip-vpu/rk3288_vpu.c
+++ b/drivers/media/platform/rockchip-vpu/rk3288_vpu.c
@@ -179,12 +179,14 @@ void rk3288_vpu_run_done(struct rk3288_vpu_ctx *ctx,
                ctx->run_ops->run_done(ctx, result);
 
        if (!rk3288_vpu_ctx_is_dummy_encode(ctx)) {
-               struct vb2_buffer *src = &ctx->run.src->b;
-               struct vb2_buffer *dst = &ctx->run.dst->b;
-
-               dst->v4l2_buf.timestamp = src->v4l2_buf.timestamp;
-               vb2_buffer_done(&ctx->run.src->b, result);
-               vb2_buffer_done(&ctx->run.dst->b, result);
+               struct vb2_v4l2_buffer *src =
+                       to_vb2_v4l2_buffer(&ctx->run.src->vb.vb2_buf);
+               struct vb2_v4l2_buffer *dst =
+                       to_vb2_v4l2_buffer(&ctx->run.dst->vb.vb2_buf);
+
+               dst->timestamp = src->timestamp;
+               vb2_buffer_done(&ctx->run.src->vb.vb2_buf, result);
+               vb2_buffer_done(&ctx->run.dst->vb.vb2_buf, result);
        }
 
        dev->current_ctx = NULL;
@@ -399,7 +401,7 @@ static int rk3288_vpu_open(struct file *filp)
        }
 
        q->mem_ops = &vb2_dma_contig_memops;
-       q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+       q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
        ret = vb2_queue_init(q);
        if (ret) {
@@ -421,7 +423,7 @@ static int rk3288_vpu_open(struct file *filp)
                q->ops = get_dec_queue_ops();
 
        q->mem_ops = &vb2_dma_contig_memops;
-       q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+       q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
        ret = vb2_queue_init(q);
        if (ret) {

diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_common.h b/drivers/media/platform/rockchip-vpu/rk3288_vpu_common.h
index 9ac44e82c42f9ecb17f2398839a93809dc67c31e..5bafbc12b943d6955973f1eaa20b9ccd4dc84d64 100644 (file)
--- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_common.h
+++ b/drivers/media/platform/rockchip-vpu/rk3288_vpu_common.h
@@ -103,12 +103,12 @@ struct rk3288_vpu_vp8e_buf_data {
 
 /**
  * struct rk3288_vpu_buf - Private data related to each VB2 buffer.
+ * @vb:                        Pointer to related VB2 buffer.
  * @list:              List head for queuing in buffer queue.
- * @b:                 Pointer to related VB2 buffer.
  * @flags:             Buffer state. See enum rk3288_vpu_buf_flags.
  */
 struct rk3288_vpu_buf {
-       struct vb2_buffer b;
+       struct vb2_v4l2_buffer vb;
        struct list_head list;
 
        /* Mode-specific data. */
@@ -440,7 +440,7 @@ static inline struct rk3288_vpu_ctx *ctrl_to_ctx(struct v4l2_ctrl *ctrl)
 
 static inline struct rk3288_vpu_buf *vb_to_buf(struct vb2_buffer *vb)
 {
-       return container_of(vb, struct rk3288_vpu_buf, b);
+       return container_of(to_vb2_v4l2_buffer(vb), struct rk3288_vpu_buf, vb);
 }
 
 static inline bool rk3288_vpu_ctx_is_encoder(struct rk3288_vpu_ctx *ctx)

diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.c
index 3d4aad957a1e4b2f7f5a0afb6810a4a0e951a332..0652ae7a132f9c5e8dd47961cb195294428011e0 100644 (file)
--- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.c
+++ b/drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.c
@@ -170,8 +170,9 @@ static int vidioc_querycap(struct file *file, void *priv,
         * device capability flags are left only for backward compatibility
         * and are scheduled for removal.
         */
-       cap->capabilities = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING |
+       cap->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING |
            V4L2_CAP_VIDEO_CAPTURE_MPLANE | V4L2_CAP_VIDEO_OUTPUT_MPLANE;
+       cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
 
        vpu_debug_leave();
 
@@ -817,7 +818,7 @@ static const struct v4l2_ioctl_ops rk3288_vpu_dec_ioctl_ops = {
 };
 
 static int rk3288_vpu_queue_setup(struct vb2_queue *vq,
-                                 const struct v4l2_format *fmt,
+                                 const void *parg,
                                  unsigned int *buf_count,
                                  unsigned int *plane_count,
                                  unsigned int psize[], void *allocators[])
@@ -880,7 +881,7 @@ static int rk3288_vpu_buf_init(struct vb2_buffer *vb)
        vpu_debug_enter();
 
        if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
-               ctx->dst_bufs[vb->v4l2_buf.index] = vb;
+               ctx->dst_bufs[vb->index] = vb;
 
        vpu_debug_leave();
 
@@ -895,7 +896,7 @@ static void rk3288_vpu_buf_cleanup(struct vb2_buffer *vb)
        vpu_debug_enter();
 
        if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
-               ctx->dst_bufs[vb->v4l2_buf.index] = NULL;
+               ctx->dst_bufs[vb->index] = NULL;
 
        vpu_debug_leave();
 }
@@ -1013,9 +1014,9 @@ static void rk3288_vpu_stop_streaming(struct vb2_queue *q)
 
        while (!list_empty(&queue)) {
                b = list_first_entry(&queue, struct rk3288_vpu_buf, list);
-               for (i = 0; i < b->b.num_planes; i++)
-                       vb2_set_plane_payload(&b->b, i, 0);
-               vb2_buffer_done(&b->b, VB2_BUF_STATE_ERROR);
+               for (i = 0; i < b->vb.vb2_buf.num_planes; i++)
+                       vb2_set_plane_payload(&b->vb.vb2_buf, i, 0);
+               vb2_buffer_done(&b->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                list_del(&b->list);
        }
 
@@ -1091,7 +1092,7 @@ const struct v4l2_ioctl_ops *get_dec_v4l2_ioctl_ops(void)
 
 static void rk3288_vpu_dec_prepare_run(struct rk3288_vpu_ctx *ctx)
 {
-       struct v4l2_buffer *src = &ctx->run.src->b.v4l2_buf;
+       struct vb2_v4l2_buffer *src = to_vb2_v4l2_buffer(&ctx->run.src->vb.vb2_buf);
 
        v4l2_ctrl_apply_store(&ctx->ctrl_handler, src->config_store);
 
@@ -1116,7 +1117,7 @@ static void rk3288_vpu_dec_run_done(struct rk3288_vpu_ctx *ctx,
                                    enum vb2_buffer_state result)
 {
        struct v4l2_plane_pix_format *plane_fmts = ctx->dst_fmt.plane_fmt;
-       struct vb2_buffer *dst = &ctx->run.dst->b;
+       struct vb2_buffer *dst = &ctx->run.dst->vb.vb2_buf;
        int i;
 
        if (result != VB2_BUF_STATE_DONE) {

diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.c
index 54b54ae6726de68d64c7b37be796b0b9f378f572..0c9ce38d75531d886f4b2c40eb6aba11810d1665 100644 (file)
--- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.c
+++ b/drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.c
@@ -348,8 +348,9 @@ static int vidioc_querycap(struct file *file, void *priv,
         * device capability flags are left only for backward compatibility
         * and are scheduled for removal.
         */
-       cap->capabilities = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING |
+       cap->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING |
            V4L2_CAP_VIDEO_CAPTURE_MPLANE | V4L2_CAP_VIDEO_OUTPUT_MPLANE;
+       cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
 
        vpu_debug_leave();
 
@@ -1045,7 +1046,7 @@ static const struct v4l2_ioctl_ops rk3288_vpu_enc_ioctl_ops = {
 };
 
 static int rk3288_vpu_queue_setup(struct vb2_queue *vq,
-                                 const struct v4l2_format *fmt,
+                                 const void *parg,
                                  unsigned int *buf_count,
                                  unsigned int *plane_count,
                                  unsigned int psize[], void *allocators[])
@@ -1230,9 +1231,9 @@ static void rk3288_vpu_stop_streaming(struct vb2_queue *q)
 
        while (!list_empty(&queue)) {
                b = list_first_entry(&queue, struct rk3288_vpu_buf, list);
-               for (i = 0; i < b->b.num_planes; i++)
-                       vb2_set_plane_payload(&b->b, i, 0);
-               vb2_buffer_done(&b->b, VB2_BUF_STATE_ERROR);
+               for (i = 0; i < b->vb.vb2_buf.num_planes; i++)
+                       vb2_set_plane_payload(&b->vb.vb2_buf, i, 0);
+               vb2_buffer_done(&b->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                list_del(&b->list);
        }
 
@@ -1307,8 +1308,8 @@ const struct v4l2_ioctl_ops *get_enc_v4l2_ioctl_ops(void)
 
 static void rk3288_vpu_enc_prepare_run(struct rk3288_vpu_ctx *ctx)
 {
-       struct vb2_buffer *vb2_src = &ctx->run.src->b;
-       unsigned config_store = vb2_src->v4l2_buf.config_store;
+       struct vb2_v4l2_buffer *vb2_src = to_vb2_v4l2_buffer(&ctx->run.src->vb.vb2_buf);
+       unsigned config_store = vb2_src->config_store;
 
        v4l2_ctrl_apply_store(&ctx->ctrl_handler, config_store);
 

diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264d.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264d.c
index b03491efbf32eab8c94a1d4d5c085fb736dfe9aa..3569d9219f8c75eb903d28ed42f1c9c4fcca09a6 100644 (file)
--- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264d.c
+++ b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264d.c
@@ -302,7 +302,7 @@ static void rk3288_vpu_h264d_set_params(struct rk3288_vpu_ctx *ctx)
        reg = VDPU_REG_DEC_CTRL3_START_CODE_E
                | VDPU_REG_DEC_CTRL3_INIT_QP(pps->pic_init_qp_minus26 + 26)
                | VDPU_REG_DEC_CTRL3_STREAM_LEN(
-                       vb2_get_plane_payload(&ctx->run.src->b, 0));
+                       vb2_get_plane_payload(&ctx->run.src->vb.vb2_buf, 0));
        vdpu_write_relaxed(vpu, reg, VDPU_REG_DEC_CTRL3);
 
        /* Decoder control register 4. */
@@ -487,7 +487,7 @@ static void rk3288_vpu_h264d_set_ref(struct rk3288_vpu_ctx *ctx)
                    && dpb[i].buf_index < ctx->vq_dst.num_buffers)
                        buf = ctx->dst_bufs[dpb[i].buf_index];
                else
-                       buf = &ctx->run.dst->b;
+                       buf = &ctx->run.dst->vb.vb2_buf;
 
                vdpu_write_relaxed(vpu, vb2_dma_contig_plane_dma_addr(buf, 0),
                                        VDPU_REG_ADDR_REF(i));
@@ -503,11 +503,11 @@ static void rk3288_vpu_h264d_set_buffers(struct rk3288_vpu_ctx *ctx)
        dma_addr_t src_dma, dst_dma;
 
        /* Source (stream) buffer. */
-       src_dma = vb2_dma_contig_plane_dma_addr(&ctx->run.src->b, 0);
+       src_dma = vb2_dma_contig_plane_dma_addr(&ctx->run.src->vb.vb2_buf, 0);
        vdpu_write_relaxed(vpu, src_dma, VDPU_REG_ADDR_STR);
 
        /* Destination (decoded frame) buffer. */
-       dst_dma = vb2_dma_contig_plane_dma_addr(&ctx->run.dst->b, 0);
+       dst_dma = vb2_dma_contig_plane_dma_addr(&ctx->run.dst->vb.vb2_buf, 0);
        vdpu_write_relaxed(vpu, dst_dma, VDPU_REG_ADDR_DST);
 
        /* Higher profiles require DMV buffer appended to reference frames. */
@@ -544,7 +544,7 @@ void rk3288_vpu_h264d_run(struct rk3288_vpu_ctx *ctx)
        schedule_delayed_work(&vpu->watchdog_work, msecs_to_jiffies(2000));
 
        /* Start decoding! */
-       vdpu_write_relaxed(vpu, VDPU_REG_CONFIG_DEC_AXI_RD_ID(0xff)
+       vdpu_write_relaxed(vpu, VDPU_REG_CONFIG_DEC_AXI_RD_ID(0xffu)
                                | VDPU_REG_CONFIG_DEC_TIMEOUT_E
                                | VDPU_REG_CONFIG_DEC_OUT_ENDIAN
                                | VDPU_REG_CONFIG_DEC_STRENDIAN_E

diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8d.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8d.c
index 6e03398d451dfd4dd50703309ef75f80349d1ad2..bcb3cadf186184a935e01e67eb82c0ae7939e675 100644 (file)
--- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8d.c
+++ b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8d.c
@@ -207,8 +207,8 @@ static void rk3288_vp8d_dump_hdr(struct rk3288_vpu_ctx *ctx)
 
        /* stream addresses */
        vpu_debug(4, "Addresses: segmap=0x%x, probs=0x%x\n",
-                       ctx->hw.vp8d.segment_map.dma,
-                       ctx->hw.vp8d.prob_tbl.dma);
+                       (int)ctx->hw.vp8d.segment_map.dma,
+                       (int)ctx->hw.vp8d.prob_tbl.dma);
 
        /* reference frame info */
        vpu_debug(4, "Ref frame: last=%d, golden=%d, alt=%d\n",
@@ -448,7 +448,7 @@ static void rk3288_vp8d_cfg_parts(struct rk3288_vpu_ctx *ctx)
        u32 count = 0;
        u32 i;
 
-       src_dma = vb2_dma_contig_plane_dma_addr(&ctx->run.src->b, 0);
+       src_dma = vb2_dma_contig_plane_dma_addr(&ctx->run.src->vb.vb2_buf, 0);
 
        /*
         * Calculate control partition mb data info
@@ -581,13 +581,13 @@ static void rk3288_vp8d_cfg_ref(struct rk3288_vpu_ctx *ctx)
 
        /* set last frame address */
        if (hdr->last_frame >= ctx->vq_dst.num_buffers)
-               buf = &ctx->run.dst->b;
+               buf = &ctx->run.dst->vb.vb2_buf;
        else
                buf = ctx->dst_bufs[hdr->last_frame];
 
        if (!hdr->key_frame)
                vdpu_write_relaxed(vpu,
-                       vb2_dma_contig_plane_dma_addr(&ctx->run.dst->b, 0),
+                       vb2_dma_contig_plane_dma_addr(&ctx->run.dst->vb.vb2_buf, 0),
                        VDPU_REG_ADDR_REF(0));
        else
                vdpu_write_relaxed(vpu, vb2_dma_contig_plane_dma_addr(buf, 0),
@@ -595,7 +595,7 @@ static void rk3288_vp8d_cfg_ref(struct rk3288_vpu_ctx *ctx)
 
        /* set golden reference frame buffer address */
        if (hdr->golden_frame >= ctx->vq_dst.num_buffers)
-               buf = &ctx->run.dst->b;
+               buf = &ctx->run.dst->vb.vb2_buf;
        else
                buf = ctx->dst_bufs[hdr->golden_frame];
 
@@ -606,7 +606,7 @@ static void rk3288_vp8d_cfg_ref(struct rk3288_vpu_ctx *ctx)
 
        /* set alternate reference frame buffer address */
        if (hdr->alt_frame >= ctx->vq_dst.num_buffers)
-               buf = &ctx->run.dst->b;
+               buf = &ctx->run.dst->vb.vb2_buf;
        else
                buf = ctx->dst_bufs[hdr->alt_frame];
 
@@ -638,7 +638,7 @@ static void rk3288_vp8d_cfg_buffers(struct rk3288_vpu_ctx *ctx)
 
        /* set output frame buffer address */
        vdpu_write_relaxed(vpu,
-                       vb2_dma_contig_plane_dma_addr(&ctx->run.dst->b, 0),
+                       vb2_dma_contig_plane_dma_addr(&ctx->run.dst->vb.vb2_buf, 0),
                        VDPU_REG_ADDR_DST);
 }
 

diff --git a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8e.c b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8e.c
index ce02712dc9fcffad49958327494d98fdfd673022..5ba84204fed3e354ae635d1e41b37f330a8d118e 100644 (file)
--- a/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8e.c
+++ b/drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8e.c
@@ -63,6 +63,7 @@ struct rk3288_vpu_vp8e_ctrl_buf {
 void rk3288_vpu_vp8e_assemble_bitstream(struct rk3288_vpu_ctx *ctx,
                                        struct rk3288_vpu_buf *dst_buf)
 {
+       struct vb2_v4l2_buffer *vb2_dst = to_vb2_v4l2_buffer(&dst_buf->vb.vb2_buf);
        size_t ext_hdr_size = dst_buf->vp8e.ext_hdr_size;
        size_t dct_size = dst_buf->vp8e.dct_size;
        size_t hdr_size = dst_buf->vp8e.hdr_size;
@@ -71,8 +72,8 @@ void rk3288_vpu_vp8e_assemble_bitstream(struct rk3288_vpu_ctx *ctx,
        void *dst;
        u32 *tag;
 
-       dst_size = vb2_plane_size(&dst_buf->b, 0);
-       dst = vb2_plane_vaddr(&dst_buf->b, 0);
+       dst_size = vb2_plane_size(&dst_buf->vb.vb2_buf, 0);
+       dst = vb2_plane_vaddr(&dst_buf->vb.vb2_buf, 0);
        tag = dst; /* To access frame tag words. */
 
        if (WARN_ON(hdr_size + ext_hdr_size + dct_size > dst_size))
@@ -80,15 +81,12 @@ void rk3288_vpu_vp8e_assemble_bitstream(struct rk3288_vpu_ctx *ctx,
        if (WARN_ON(dst_buf->vp8e.dct_offset + dct_size > dst_size))
                return;
 
-       vpu_debug(1, "%s: hdr_size = %u, ext_hdr_size = %u, dct_size = %u\n",
-                       __func__, hdr_size, ext_hdr_size, dct_size);
-
        memmove(dst + hdr_size + ext_hdr_size,
                dst + dst_buf->vp8e.dct_offset, dct_size);
        memcpy(dst, dst_buf->vp8e.header, hdr_size);
 
        /* Patch frame tag at first 32-bit word of the frame. */
-       if (dst_buf->b.v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) {
+       if (vb2_dst->flags & V4L2_BUF_FLAG_KEYFRAME) {
                tag_size = VP8_KEY_FRAME_HDR_SIZE;
                tag[0] &= ~VP8_FRAME_TAG_KEY_FRAME_BIT;
        } else {
@@ -100,7 +98,7 @@ void rk3288_vpu_vp8e_assemble_bitstream(struct rk3288_vpu_ctx *ctx,
        tag[0] |= (hdr_size + ext_hdr_size - tag_size)
                                                << VP8_FRAME_TAG_LENGTH_SHIFT;
 
-       vb2_set_plane_payload(&dst_buf->b, 0,
+       vb2_set_plane_payload(&dst_buf->vb.vb2_buf, 0,
                                hdr_size + ext_hdr_size + dct_size);
 }
 
@@ -183,6 +181,7 @@ static inline u32 enc_in_img_ctrl(struct rk3288_vpu_ctx *ctx)
 static void rk3288_vpu_vp8e_set_buffers(struct rk3288_vpu_dev *vpu,
                                        struct rk3288_vpu_ctx *ctx)
 {
+       struct vb2_v4l2_buffer *vb2_dst = to_vb2_v4l2_buffer(&ctx->run.dst->vb.vb2_buf);
        const struct rk3288_vp8e_reg_params *params = ctx->run.vp8e.reg_params;
        dma_addr_t ref_buf_dma, rec_buf_dma;
        dma_addr_t stream_dma;
@@ -205,8 +204,8 @@ static void rk3288_vpu_vp8e_set_buffers(struct rk3288_vpu_dev *vpu,
                dst_dma = vpu->dummy_encode_dst.dma;
                dst_size = vpu->dummy_encode_dst.size;
        } else {
-               dst_dma = vb2_dma_contig_plane_dma_addr(&ctx->run.dst->b, 0);
-               dst_size = vb2_plane_size(&ctx->run.dst->b, 0);
+               dst_dma = vb2_dma_contig_plane_dma_addr(&ctx->run.dst->vb.vb2_buf, 0);
+               dst_size = vb2_plane_size(&ctx->run.dst->vb.vb2_buf, 0);
        }
 
        /*
@@ -228,9 +227,9 @@ static void rk3288_vpu_vp8e_set_buffers(struct rk3288_vpu_dev *vpu,
        ctx->run.dst->vp8e.hdr_size = params->hdr_len + (start_offset >> 3);
 
        if (params->enc_ctrl & VEPU_REG_ENC_CTRL_KEYFRAME_BIT)
-               ctx->run.dst->b.v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;
+               vb2_dst->flags |= V4L2_BUF_FLAG_KEYFRAME;
        else
-               ctx->run.dst->b.v4l2_buf.flags &= ~V4L2_BUF_FLAG_KEYFRAME;
+               vb2_dst->flags &= ~V4L2_BUF_FLAG_KEYFRAME;
 
        /*
         * We assume here that 1/10 of the buffer is enough for headers.
@@ -280,13 +279,13 @@ static void rk3288_vpu_vp8e_set_buffers(struct rk3288_vpu_dev *vpu,
                                        VEPU_REG_ADDR_IN_CR);
        } else {
                vepu_write_relaxed(vpu, vb2_dma_contig_plane_dma_addr(
-                                       &ctx->run.src->b, PLANE_Y),
+                                       &ctx->run.src->vb.vb2_buf, PLANE_Y),
                                        VEPU_REG_ADDR_IN_LUMA);
                vepu_write_relaxed(vpu, vb2_dma_contig_plane_dma_addr(
-                                       &ctx->run.src->b, PLANE_CB),
+                                       &ctx->run.src->vb.vb2_buf, PLANE_CB),
                                        VEPU_REG_ADDR_IN_CB);
                vepu_write_relaxed(vpu, vb2_dma_contig_plane_dma_addr(
-                                       &ctx->run.src->b, PLANE_CR),
+                                       &ctx->run.src->vb.vb2_buf, PLANE_CR),
                                        VEPU_REG_ADDR_IN_CR);
        }
 
@@ -365,6 +364,7 @@ static void rk3288_vpu_vp8e_set_params(struct rk3288_vpu_dev *vpu,
 
 void rk3288_vpu_vp8e_run(struct rk3288_vpu_ctx *ctx)
 {
+       struct vb2_v4l2_buffer *vb2_dst = to_vb2_v4l2_buffer(&ctx->run.dst->vb.vb2_buf);
        struct rk3288_vpu_dev *vpu = ctx->dev;
        u32 reg;
 
@@ -408,7 +408,7 @@ void rk3288_vpu_vp8e_run(struct rk3288_vpu_ctx *ctx)
                | VEPU_REG_ENC_CTRL_ENC_MODE_VP8
                | VEPU_REG_ENC_CTRL_EN_BIT;
 
-       if (ctx->run.dst->b.v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME)
+       if (vb2_dst->flags & V4L2_BUF_FLAG_KEYFRAME)
                reg |= VEPU_REG_ENC_CTRL_KEYFRAME_BIT;
 
        vepu_write(vpu, reg, VEPU_REG_ENC_CTRL);