From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CE57C7618B for ; Thu, 25 Jul 2019 16:22:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5E1A22BED for ; Thu, 25 Jul 2019 16:22:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564071761; bh=RYBXx0/B1Pv8SZ9sBhypzMSjz4cPuNknB87cHb2fNIY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=uNl62efM1ehqusutcZzBtVKiG+vurjd3AqCml5PFPZ2bbtU9fSwGFOAF/GeRBN467 tge3jAgqsIiCPomM9mlsL3ZpVP3kzi1sRY9TdSa5xUKyo/lWw5UGhJzIF3hLZ39wlW XUnatNPdO+cRxFTUWW8wad7u3xBeDdz4z2zldBJM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390395AbfGYQWk (ORCPT ); Thu, 25 Jul 2019 12:22:40 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:32838 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388971AbfGYQWk (ORCPT ); Thu, 25 Jul 2019 12:22:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Subject:Cc:To: From:Date:Sender:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=jmxq7cUH+5nrEr7J45H3lQqJP+cVdwe0XIslgATjMww=; b=qao610lA7li0A6DLNca9Jd/9R 0cMhCxxeQZZmf0ivJrFAhVZsSVfS957oa2EXoGSGnwsxPj/yIBWDIQOUoWIuA9CngUgAMlyfZukP8 ptet1sLz2z5kpWhQs9N33WkWwNKgwIFyxxAN5rfBpiOoY9TFOpZ13WOkUPT4Mcq/TKpsdHtsm0EW/ G3M7n8cALjW/XVtN5QhPeDNuxEytgPYQU+DU79fgl10kWQF4IHEpi1jWvZRGIsX/XKgtieOfg2O11 DLffj/fs0TjGnsjuS6eneugp8cKWa4P7kNCCoNDNZbW4mE9jr63Dcg0So8GEMAxx3CoM4TnUTf4vr J05edpcKw==; Received: from [179.95.31.157] (helo=coco.lan) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hqgVo-0001QW-C5; Thu, 25 Jul 2019 16:22:36 +0000 Date: Thu, 25 Jul 2019 13:22:30 -0300 From: Mauro Carvalho Chehab To: Ezequiel Garcia Cc: linux-media@vger.kernel.org, Hans Verkuil , kernel@collabora.com, Nicolas Dufresne , Tomasz Figa , linux-rockchip@lists.infradead.org, Heiko Stuebner , Jonas Karlman , Philipp Zabel , Boris Brezillon , Paul Kocialkowski , Alexandre Courbot , fbuergisser@chromium.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 6/7] media: hantro: Move VP8 common code Message-ID: <20190725132230.6e7f0c22@coco.lan> In-Reply-To: <20190725141756.2518-7-ezequiel@collabora.com> References: <20190725141756.2518-1-ezequiel@collabora.com> <20190725141756.2518-7-ezequiel@collabora.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Thu, 25 Jul 2019 11:17:55 -0300 Ezequiel Garcia escreveu: > In order to introduce support for RK3399 VP8 decoding, > move some common VP8 code. This will be reused by > the RK3399 implementation, reducing code duplication. > > Signed-off-by: Ezequiel Garcia > --- > .../staging/media/hantro/hantro_g1_vp8_dec.c | 17 ----------------- > drivers/staging/media/hantro/hantro_hw.h | 4 ++++ > drivers/staging/media/hantro/hantro_vp8.c | 15 +++++++++++++++ > 3 files changed, 19 insertions(+), 17 deletions(-) > > diff --git a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c > index cd1fbd3a0d5f..181e2f76d8cb 100644 > --- a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c > +++ b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c > @@ -16,8 +16,6 @@ > #include "hantro.h" > #include "hantro_g1_regs.h" > > -#define DEC_8190_ALIGN_MASK 0x07U > - > /* DCT partition base address regs */ > static const struct hantro_reg vp8_dec_dct_base[8] = { > { G1_REG_ADDR_STR, 0, 0xffffffff }, > @@ -131,21 +129,6 @@ static const struct hantro_reg vp8_dec_pred_bc_tap[8][4] = { > }, > }; > > -/* > - * filter taps taken to 7-bit precision, > - * reference RFC6386#Page-16, filters[8][6] > - */ > -static const u32 vp8_dec_mc_filter[8][6] = { > - { 0, 0, 128, 0, 0, 0 }, > - { 0, -6, 123, 12, -1, 0 }, > - { 2, -11, 108, 36, -8, 1 }, > - { 0, -9, 93, 50, -6, 0 }, > - { 3, -16, 77, 77, -16, 3 }, > - { 0, -6, 50, 93, -9, 0 }, > - { 1, -8, 36, 108, -11, 2 }, > - { 0, -1, 12, 123, -6, 0 } > -}; > - > /* > * Set loop filters > */ > diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h > index 34ef24e3a9ef..185e27d47e47 100644 > --- a/drivers/staging/media/hantro/hantro_hw.h > +++ b/drivers/staging/media/hantro/hantro_hw.h > @@ -15,6 +15,8 @@ > #include > #include > > +#define DEC_8190_ALIGN_MASK 0x07U > + > struct hantro_dev; > struct hantro_ctx; > struct hantro_buf; > @@ -93,6 +95,8 @@ extern const struct hantro_variant rk3399_vpu_variant; > extern const struct hantro_variant rk3328_vpu_variant; > extern const struct hantro_variant rk3288_vpu_variant; > > +extern const u32 vp8_dec_mc_filter[8][6]; Please don't do that, as a symbol like that can easily cause namespace clashes in the future. For all exported symbols, please prepend the driver name, like: hantro_vp8_dec_mc_filter Regards, Mauro > + > void hantro_watchdog(struct work_struct *work); > void hantro_run(struct hantro_ctx *ctx); > void hantro_irq_done(struct hantro_dev *vpu, unsigned int bytesused, > diff --git a/drivers/staging/media/hantro/hantro_vp8.c b/drivers/staging/media/hantro/hantro_vp8.c > index 66c45335d871..be5cb01d1309 100644 > --- a/drivers/staging/media/hantro/hantro_vp8.c > +++ b/drivers/staging/media/hantro/hantro_vp8.c > @@ -31,6 +31,21 @@ struct vp8_prob_tbl_packed { > u8 padding3[96]; > }; > > +/* > + * filter taps taken to 7-bit precision, > + * reference RFC6386#Page-16, filters[8][6] > + */ > +const u32 vp8_dec_mc_filter[8][6] = { > + { 0, 0, 128, 0, 0, 0 }, > + { 0, -6, 123, 12, -1, 0 }, > + { 2, -11, 108, 36, -8, 1 }, > + { 0, -9, 93, 50, -6, 0 }, > + { 3, -16, 77, 77, -16, 3 }, > + { 0, -6, 50, 93, -9, 0 }, > + { 1, -8, 36, 108, -11, 2 }, > + { 0, -1, 12, 123, -6, 0 } > +}; > + > void hantro_vp8_prob_update(struct hantro_ctx *ctx, > const struct v4l2_ctrl_vp8_frame_header *hdr) > { Thanks, Mauro