Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1675953 > unrolled thread
| Started by | Thierry Escande <thierry.escande@collabora.com> |
|---|---|
| First post | 2017-06-27 18:10 +0200 |
| Last post | 2017-06-29 14:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v3 2/8] [media] s5p-jpeg: Correct WARN_ON statement for checking subsampling Thierry Escande <thierry.escande@collabora.com> - 2017-06-27 18:10 +0200
Re: [PATCH v3 2/8] [media] s5p-jpeg: Correct WARN_ON statement for checking subsampling Andrzej Pietrasiewicz <andrzej.p@samsung.com> - 2017-06-29 14:10 +0200
| From | Thierry Escande <thierry.escande@collabora.com> |
|---|---|
| Date | 2017-06-27 18:10 +0200 |
| Subject | [PATCH v3 2/8] [media] s5p-jpeg: Correct WARN_ON statement for checking subsampling |
| Message-ID | <tX1dV-2UD-35@gated-at.bofh.it> |
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>
---
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;
}
}
--
2.7.4
[toc] | [next] | [standalone]
| From | Andrzej Pietrasiewicz <andrzej.p@samsung.com> |
|---|---|
| Date | 2017-06-29 14:10 +0200 |
| Subject | Re: [PATCH v3 2/8] [media] s5p-jpeg: Correct WARN_ON statement for checking subsampling |
| Message-ID | <tXGqK-7pH-19@gated-at.bofh.it> |
| In reply to | #1675953 |
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;
> }
> }
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web