summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2014-04-10 04:32:12 -0300
committerJacek Anaszewski <j.anaszewski@samsung.com>2014-11-05 16:05:22 +0100
commita3a2687314d47dfac97c09632a510406816f311e (patch)
tree893b46903c42a572aee091ca3f808af955509105
parent691af931a1f48e52381819d3acd90515c4b159b5 (diff)
downloadlinux-3.10-a3a2687314d47dfac97c09632a510406816f311e.tar.gz
linux-3.10-a3a2687314d47dfac97c09632a510406816f311e.tar.bz2
linux-3.10-a3a2687314d47dfac97c09632a510406816f311e.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. Change-Id: Iedda710f6e6ea62555e2bde9481f7e789eb36fb9 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>
-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 8202fed7934..5cf7835a64d 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)) {