summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2014-04-10 04:32:12 -0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 12:01:12 +0900
commit7e6219aa75312a5660cba94d1ae6c8d4ee6805c3 (patch)
tree73cd294ef96ca1428ec21e1514ad25b9f73949b5
parent069d5ef143183f516612f45535b7ba18a6451e15 (diff)
downloadlinux-3.10-7e6219aa75312a5660cba94d1ae6c8d4ee6805c3.tar.gz
linux-3.10-7e6219aa75312a5660cba94d1ae6c8d4ee6805c3.tar.bz2
linux-3.10-7e6219aa75312a5660cba94d1ae6c8d4ee6805c3.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)) {