GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-03-21 06:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

set sizeimage and default channel in VFE (#655)

Browse source
This commit is contained in:
George Talusan 2017-05-14 12:16:35 -04:00 • committed by Mikhail
parent aa1b59710d
commit 02df043c2c
1 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
patch/kernel/sun8i-default/vfe-set-channel-sizeimage.patch Normal file
View file

@ -0,0 +1,37 @@
diff --git a/drivers/media/video/sunxi-vfe/vfe.c b/drivers/media/video/sunxi-vfe/vfe.c
index 1d518924..a3a8ab33 100755
--- a/drivers/media/video/sunxi-vfe/vfe.c
+++ b/drivers/media/video/sunxi-vfe/vfe.c
@@ -2047,10 +2047,12 @@ static enum v4l2_mbus_pixelcode *try_fmt_internal(struct vfe_dev *dev,struct v4l
f->fmt.pix.width = ccm_fmt.width;
f->fmt.pix.height = ccm_fmt.height;
+ f->fmt.pix.sizeimage = ccm_fmt.height * f->fmt.pix.bytesperline;
vfe_dbg(0,"bus pixel code = %x at %s\n",*bus_pix_code,__func__);
vfe_dbg(0,"pix->width = %d at %s\n",f->fmt.pix.width,__func__);
vfe_dbg(0,"pix->height = %d at %s\n",f->fmt.pix.height,__func__);
+ vfe_dbg(0,"pix->sizeimage = %d at %s\n",f->fmt.pix.sizeimage,__func__);
return bus_pix_code;
}
@@ -2108,6 +2110,8 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
return 0;
}
+static int vidioc_s_input(struct file *file, void *priv, unsigned int i);
+
static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
@@ -2135,6 +2139,10 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
return -EBUSY;
}
+ if (!dev->vfe_s_input_flag) {
+ vidioc_s_input(file, NULL, 0);
+ }
+
mutex_lock(&q->vb_lock);
bus_pix_code = try_fmt_internal(dev,f);