From: Jacek Anaszewski Date: Thu, 10 Apr 2014 07:32:12 +0000 (-0300) Subject: [media] s5p-jpeg: Perform fourcc downgrade only for Exynos4x12 SoCs X-Git-Tag: next-20140516~74^2~2^2~9 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=35cd02a3ec2a1a784b612a5e2d71e9d41319c335 [media] s5p-jpeg: Perform fourcc downgrade only for Exynos4x12 SoCs Change the driver variant check from "is not S5PC210" to "is Exynos4" while checking whether YUV format needs to be downgraded in order to prevent upsampling which is not supported by Exynos4 SoCs family. Signed-off-by: Jacek Anaszewski Signed-off-by: Kyungmin Park Signed-off-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 8202fed79345..5cf7835a64d2 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -1070,7 +1070,7 @@ static int s5p_jpeg_try_fmt_vid_cap(struct file *file, void *priv, * If this requirement is not met then downgrade the requested * capture format to the one with subsampling equal to the input jpeg. */ - if ((ctx->jpeg->variant->version != SJPEG_S5P) && + if ((ctx->jpeg->variant->version == SJPEG_EXYNOS4) && (ctx->mode == S5P_JPEG_DECODE) && (fmt->flags & SJPEG_FMT_NON_RGB) && (fmt->subsampling < ctx->subsampling)) {