lkml.org 
[lkml]   [2017]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v3 2/8] [media] s5p-jpeg: Correct WARN_ON statement for checking subsampling
From
Date
W dniu 27.06.2017 o 18:08, Thierry Escande pisze:
> From: Tony K Nadackal <tony.kn@samsung.com>
>
> Corrects the WARN_ON statement for subsampling based on the
> JPEG Hardware version.
>
> Signed-off-by: Tony K Nadackal <tony.kn@samsung.com>
> Signed-off-by: Thierry Escande <thierry.escande@collabora.com>

Acked-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>

> ---
> drivers/media/platform/s5p-jpeg/jpeg-core.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> index 623508d..0d935f5 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
> +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> @@ -614,24 +614,26 @@ static inline struct s5p_jpeg_ctx *fh_to_ctx(struct v4l2_fh *fh)
>
> static int s5p_jpeg_to_user_subsampling(struct s5p_jpeg_ctx *ctx)
> {
> - WARN_ON(ctx->subsampling > 3);
> -
> switch (ctx->jpeg->variant->version) {
> case SJPEG_S5P:
> + WARN_ON(ctx->subsampling > 3);
> if (ctx->subsampling > 2)
> return V4L2_JPEG_CHROMA_SUBSAMPLING_GRAY;
> return ctx->subsampling;
> case SJPEG_EXYNOS3250:
> case SJPEG_EXYNOS5420:
> + WARN_ON(ctx->subsampling > 6);
> if (ctx->subsampling > 3)
> return V4L2_JPEG_CHROMA_SUBSAMPLING_411;
> return exynos3250_decoded_subsampling[ctx->subsampling];
> case SJPEG_EXYNOS4:
> case SJPEG_EXYNOS5433:
> + WARN_ON(ctx->subsampling > 3);
> if (ctx->subsampling > 2)
> return V4L2_JPEG_CHROMA_SUBSAMPLING_420;
> return exynos4x12_decoded_subsampling[ctx->subsampling];
> default:
> + WARN_ON(ctx->subsampling > 3);
> return V4L2_JPEG_CHROMA_SUBSAMPLING_GRAY;
> }
> }
>

\
 
 \ /
  Last update: 2017-06-29 14:04    [W:1.915 / U:0.200 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site