summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorJacek Anaszewski2014-04-10 09:32:12 +0200
committerMauro Carvalho Chehab2014-05-14 01:08:13 +0200
commit35cd02a3ec2a1a784b612a5e2d71e9d41319c335 (patch)
treed48796878502540fabf11c68a54c8b57acdad3da /drivers/media/platform
parent[media] s5p-jpeg: Add fmt_ver_flag field to the s5p_jpeg_variant structure (diff)
downloadkernel-qcow2-linux-35cd02a3ec2a1a784b612a5e2d71e9d41319c335.tar.gz
kernel-qcow2-linux-35cd02a3ec2a1a784b612a5e2d71e9d41319c335.tar.xz
kernel-qcow2-linux-35cd02a3ec2a1a784b612a5e2d71e9d41319c335.zip
[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 <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/s5p-jpeg/jpeg-core.c2
1 files changed, 1 insertions, 1 deletions
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)) {