redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

MLK-21985-3 vpu: windsor: b0: fix build for next 20190607 upgrade 

Due to below commit:
7e98b7b542 ("media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap, out}_mplane")

../drivers/mxc/vpu_windsor/vpu_encoder_b0.c:1586:2: error: unknown field ‘vidioc_enum_fmt_vid_cap_mplane’ specified in initializer
  .vidioc_enum_fmt_vid_cap_mplane = vpu_enc_v4l2_ioctl_enum_fmt_vid_cap_mplane,
  ^
../drivers/mxc/vpu_windsor/vpu_encoder_b0.c:1587:2: error: unknown field ‘vidioc_enum_fmt_vid_out_mplane’ specified in initializer
  .vidioc_enum_fmt_vid_out_mplane = vpu_enc_v4l2_ioctl_enum_fmt_vid_out_mplane,
  ^
../scripts/Makefile.build:278: recipe for target 'drivers/mxc/vpu_windsor/vpu_encoder_b0.o' failed
make[4]: *** [drivers/mxc/vpu_windsor/vpu_encoder_b0.o] Error 1

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
5.4-rM2-2.2.x-imx-squashed
Dong Aisheng 2019-06-10 20:08:25 +08:00
parent 937fff6194
commit 9d9cc0d614
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mxc/vpu_windsor/vpu_encoder_b0.c
View File

@ -346,7 +346,7 @@ static int vpu_enc_v4l2_ioctl_querycap(struct file *file,
return 0;
}
static int vpu_enc_v4l2_ioctl_enum_fmt_vid_cap_mplane(struct file *file,
static int vpu_enc_v4l2_ioctl_enum_fmt_vid_cap(struct file *file,
void *fh,
struct v4l2_fmtdesc *f)
{
@ -362,7 +362,7 @@ static int vpu_enc_v4l2_ioctl_enum_fmt_vid_cap_mplane(struct file *file,
f->flags |= V4L2_FMT_FLAG_COMPRESSED;
return 0;
}
static int vpu_enc_v4l2_ioctl_enum_fmt_vid_out_mplane(struct file *file,
static int vpu_enc_v4l2_ioctl_enum_fmt_vid_out(struct file *file,
void *fh,
struct v4l2_fmtdesc *f)
{
@ -1583,8 +1583,8 @@ static int vpu_enc_v4l2_ioctl_streamoff(struct file *file,
static const struct v4l2_ioctl_ops vpu_enc_v4l2_ioctl_ops = {
.vidioc_querycap = vpu_enc_v4l2_ioctl_querycap,
.vidioc_enum_fmt_vid_cap_mplane = vpu_enc_v4l2_ioctl_enum_fmt_vid_cap_mplane,
.vidioc_enum_fmt_vid_out_mplane = vpu_enc_v4l2_ioctl_enum_fmt_vid_out_mplane,
.vidioc_enum_fmt_vid_cap = vpu_enc_v4l2_ioctl_enum_fmt_vid_cap,
.vidioc_enum_fmt_vid_out = vpu_enc_v4l2_ioctl_enum_fmt_vid_out,
.vidioc_enum_framesizes = vpu_enc_v4l2_ioctl_enum_framesizes,
.vidioc_enum_frameintervals = vpu_enc_v4l2_ioctl_enum_frameintervals,
.vidioc_g_fmt_vid_cap_mplane = vpu_enc_v4l2_ioctl_g_fmt,