From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752778AbdF2MD6 (ORCPT ); Thu, 29 Jun 2017 08:03:58 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:63381 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752143AbdF2MDt (ORCPT ); Thu, 29 Jun 2017 08:03:49 -0400 X-AuditID: cbfec7f2-f797e6d000004438-06-5954eca2b757 Subject: Re: [PATCH v3 2/8] [media] s5p-jpeg: Correct WARN_ON statement for checking subsampling To: Thierry Escande , Jacek Anaszewski , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org From: Andrzej Pietrasiewicz Message-id: <22da9d2c-a56b-9d57-33a6-79eb42923041@samsung.com> Date: Thu, 29 Jun 2017 14:03:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-version: 1.0 In-reply-to: <1498579734-1594-3-git-send-email-thierry.escande@collabora.com> Content-type: text/plain; charset=utf-8; format=flowed Content-language: en-US Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFKsWRmVeSWpSXmKPExsWy7djPc7qL34REGmx6wGRxe+sGFovLu+aw WfRs2MpqsWzTHyaL/quX2BxYPXbcXcLosXPWXXaPTas62Tw+b5ILYInisklJzcksSy3St0vg yph4YBdzwTfeilXv/jA1MK7n7mLk4JAQMJH4uKO2i5ETyBSTuHBvPVsXIxeHkMBSRon1k86x QDifGSWOT2tjhqgykfi5aAkzRGIZo8TLN0vZIZwXjBJXL1xmBhkrLJAksXuGI0hcRGACo8SB bTvZQbqZBWwlOg51soDYbALGEnsPdjCC2LwCdhLnf3SzgdgsAqoSp/btZQKxRQUiJBZNmsgO USMo8WPyPbBeTgFfiT3NE1kgZlpJPPvXygphi0s0t96EistLbF7zFuxSCYFF7BJH+9+zQPws K7HpANQ3LhLz3z9kg7CFJV4d38IOYctIdHYcZILoncwoseHmBxYIZzujxNpjJ1ghqqwlDh+/ CLWZT2LStunMEAt4JTrahCBKPCQOPH/NBBF2lDi9vQoSWI8ZJQ42zmafwKgwC8lvs5D8MwvJ P7OQ/LOAkWUVo0hqaXFuemqxsV5xYm5xaV66XnJ+7iZGYIo5/e/4px2MX09YHWIU4GBU4uFl WBscKcSaWFZcmXuIUYKDWUmEl/lFSKQQb0piZVVqUX58UWlOavEhRmkOFiVxXq5T1yKEBNIT S1KzU1MLUotgskwcnFINjAcebOYqnsjaXxT0elZ36P91GlJljpd0v3mq73p8arGiH8Np7r2v pI68DF+VtOHPKtG1aza8b9T8fuOrw70FD4vE2a5UZO2ri7XIfT3Fo0nnpeijd5If6k/vd9ya 0nms4jeb0WKRnuNuB5/wijseKEs9eWaj+Nbr/L4z5G+49anbF3MKKG9pq1JiKc5INNRiLipO BAD+n6kLLQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsVy+t/xa7qL3oREGuxer2pxe+sGFovLu+aw WfRs2MpqsWzTHyaL/quX2BxYPXbcXcLosXPWXXaPTas62Tw+b5ILYIlys8lITUxJLVJIzUvO T8nMS7dVCg1x07VQUshLzE21VYrQ9Q0JUlIoS8wpBfKMDNCAg3OAe7CSvl2CW8bEA7uYC77x Vqx694epgXE9dxcjJ4eEgInEz0VLmCFsMYkL99azdTFycQgJLGGU+NHewQLhvGCUuH7oH2sX IweHsECSxO4ZjiBxEYFJjBIrt/5lAulmFrCV6DjUCdXwmFHi9bJbrCAJNgFjib0HOxhBbF4B O4nzP7rZQGwWAVWJU/v2gjWLCkRI7Lp+gBWiRlDix+R7LCA2p4CvxJ7miSwQC8wkvrw8zAph i0s0t96EistLbF7zlnkCo+AsJO2zkLTMQtIyC0nLAkaWVYwiqaXFuem5xYZ6xYm5xaV56XrJ +bmbGIERt+3Yz807GC9tDD7EKMDBqMTDu2JVcKQQa2JZcWXuIUYJDmYlEV7mFyGRQrwpiZVV qUX58UWlOanFhxhNgZ6byCwlmpwPTAZ5JfGGJobmloZGxhYW5kZGSuK8JR+uhAsJpCeWpGan phakFsH0MXFwSjUwqiUYP/+q7eH8ooRR5HXZQslNldVT4wwXsh1qPNsxb1pG+5w3UnWCrP+C /zzdw393Q2Tork59jgSXR4pGrN9jvjlJ/taIK9ObctmrVfup0Y1Jclt1Ps5s/nLz8i3Fuz+e HpvA9+KA44T2W5V2Odm5XyYWGe7WFM9/M1s///zvsEpDK40PU8/OV2Ipzkg01GIuKk4EAPGP XqHOAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170629120346eucas1p1b82c27722867eff60c3bb550ac2125cd X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?QW5kcnplaiBQaWV0cmFzaWV3aWN6G1NSUE9MLUtlcm5lbCAo?= =?UTF-8?B?VFApG+yCvOyEseyghOyekBtTZW5pb3IgU29mdHdhcmUgRW5naW5lZXI=?= X-Global-Sender: =?UTF-8?B?QW5kcnplaiBUb21hc3ogUGlldHJhc2lld2ljehtTUlBPTC1L?= =?UTF-8?B?ZXJuZWwgKFRQKRtTYW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2Fy?= =?UTF-8?B?ZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170627161539epcas3p4ba1847e06b04712379d6541bcec41995 X-RootMTR: 20170627161539epcas3p4ba1847e06b04712379d6541bcec41995 References: <1498579734-1594-1-git-send-email-thierry.escande@collabora.com> <1498579734-1594-3-git-send-email-thierry.escande@collabora.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org W dniu 27.06.2017 o 18:08, Thierry Escande pisze: > From: Tony K Nadackal > > Corrects the WARN_ON statement for subsampling based on the > JPEG Hardware version. > > Signed-off-by: Tony K Nadackal > Signed-off-by: Thierry Escande Acked-by: Andrzej Pietrasiewicz > --- > 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; > } > } >