shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: ispp: fix scl0 format check error

Browse Source 
Change-Id: I05cdeb3461d0ce27060d3154159dd4f9f642222a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2020-09-14 17:58:24 +08:00
committed by Tao Huang
parent 0b1f30c59f
commit b873c8d42f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/rockchip/ispp/stream.c
View File

@@ -1233,6 +1233,7 @@ static int limit_check_scl(struct rkispp_stream *stream,
u32 max_width = 1280, max_ratio = 8, min_ratio = 2;
u32 *w = try_fmt ? &try_fmt->width : &stream->out_fmt.width;
u32 *h = try_fmt ? &try_fmt->height : &stream->out_fmt.height;
u32 forcc = try_fmt ? try_fmt->pixelformat : stream->out_fmt.pixelformat;
int ret = 0;
/* bypass scale */
@@ -1240,9 +1241,7 @@ static int limit_check_scl(struct rkispp_stream *stream,
return ret;
if (stream->id == STREAM_S0) {
u32 fmt = stream->out_cap_fmt.wr_fmt;
if (*h == sdev->out_fmt.height || (fmt & FMT_YUV422))
if (*h == sdev->out_fmt.height || (forcc == V4L2_PIX_FMT_NV16))
max_width = 3264;
else
max_width = 2080;