From: Nanxin Qin Date: Tue, 27 Oct 2020 03:11:51 +0000 (+0800) Subject: v4l: adapter uvm driver avoid build failed. [1/1] X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f5e148931583592ecc1538dbe01aa7ba42d6b0ee;p=GitHub%2FLineageOS%2FG12%2Fandroid_hardware_amlogic_kernel-modules_media.git v4l: adapter uvm driver avoid build failed. [1/1] PD#SWPL-34686 Problem: adapter uvm driver avoid build failed. Solution: dapter uvm driver avoid build failed. Verify: ac214 Signed-off-by: Nanxin Qin Change-Id: I27ed49cbdc4122897c52ab6123965c7a60fb2d88 --- diff --git a/drivers/amvdec_ports/aml_vcodec_dec.c b/drivers/amvdec_ports/aml_vcodec_dec.c index 5338dc4..b7c9046 100644 --- a/drivers/amvdec_ports/aml_vcodec_dec.c +++ b/drivers/amvdec_ports/aml_vcodec_dec.c @@ -354,9 +354,9 @@ void vdec_frame_buffer_release(void *data) struct file_private_data *priv_data = (struct file_private_data *) data; struct aml_vcodec_dev *dev = (struct aml_vcodec_dev *) - priv_data->v4l_dev_handle; + priv_data->vb_handle; struct aml_vcodec_ctx *inst = (struct aml_vcodec_ctx *) - priv_data->v4l_inst_handle; + priv_data->v4l_dec_ctx; u32 id = priv_data->v4l_inst_id; if (aml_check_inst_quit(dev, inst, id)) { @@ -1413,8 +1413,8 @@ static int vidioc_vdec_dqbuf(struct file *file, void *priv, vq = v4l2_m2m_get_vq(ctx->m2m_ctx, buf->type); vb2_v4l2 = to_vb2_v4l2_buffer(vq->bufs[buf->index]); aml_buf = container_of(vb2_v4l2, struct aml_video_dec_buf, vb); - aml_buf->privdata.v4l_dev_handle = (ulong) ctx->dev; - aml_buf->privdata.v4l_inst_handle = (ulong) ctx; + aml_buf->privdata.vb_handle = (ulong) ctx->dev; + aml_buf->privdata.v4l_dec_ctx = (ulong) ctx; aml_buf->privdata.v4l_inst_id = ctx->id; file = fget(vb2_v4l2->private);