aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Parrot2017-09-20 13:40:46 -0500
committerJean-Jacques Hiblot2018-02-19 05:09:43 -0600
commite1821ed52a9522f29e5fd98983e9b9f0f45adf74 (patch)
tree0538daed4dc1704e292f389afb6854a3920c328d
parent7393b66192f27470cf10dd43488be3906ac497ef (diff)
downloadkernel-omap-e1821ed52a9522f29e5fd98983e9b9f0f45adf74.tar.gz
kernel-omap-e1821ed52a9522f29e5fd98983e9b9f0f45adf74.tar.xz
kernel-omap-e1821ed52a9522f29e5fd98983e9b9f0f45adf74.zip
drm/omap: omap_wb: ENUM_FMT should set the correct buffer type
commit d949ca06634ef405180a3ff8b6457c67acade153 ti-linux-4.9.y We only support V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE make sure it is set in 'type' field. Signed-off-by: Benoit Parrot <bparrot@ti.com> Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
-rw-r--r--drivers/gpu/drm/omapdrm/omap_wb_cap.c1
-rw-r--r--drivers/gpu/drm/omapdrm/omap_wb_m2m.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_wb_cap.c b/drivers/gpu/drm/omapdrm/omap_wb_cap.c
index c7a12c542bf3..834138a72e53 100644
--- a/drivers/gpu/drm/omapdrm/omap_wb_cap.c
+++ b/drivers/gpu/drm/omapdrm/omap_wb_cap.c
@@ -716,6 +716,7 @@ static int wbcap_enum_fmt_vid_cap(struct file *file, void *priv,
716 if (f->index >= num_wb_formats) 716 if (f->index >= num_wb_formats)
717 return -EINVAL; 717 return -EINVAL;
718 718
719 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
719 f->pixelformat = wb_formats[f->index].fourcc; 720 f->pixelformat = wb_formats[f->index].fourcc;
720 return 0; 721 return 0;
721} 722}
diff --git a/drivers/gpu/drm/omapdrm/omap_wb_m2m.c b/drivers/gpu/drm/omapdrm/omap_wb_m2m.c
index a92662378daa..90063f9cb0f7 100644
--- a/drivers/gpu/drm/omapdrm/omap_wb_m2m.c
+++ b/drivers/gpu/drm/omapdrm/omap_wb_m2m.c
@@ -337,6 +337,7 @@ static int wbm2m_enum_fmt(struct file *file, void *priv,
337 if (f->index >= num_wb_formats) 337 if (f->index >= num_wb_formats)
338 return -EINVAL; 338 return -EINVAL;
339 339
340 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
340 f->pixelformat = wb_formats[f->index].fourcc; 341 f->pixelformat = wb_formats[f->index].fourcc;
341 return 0; 342 return 0;
342} 343}