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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable 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 C4FABC3A5A7 for ; Mon, 2 Sep 2019 11:47:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E16D217F4 for ; Mon, 2 Sep 2019 11:47:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731059AbfIBLqx (ORCPT ); Mon, 2 Sep 2019 07:46:53 -0400 Received: from lb1-smtp-cloud9.xs4all.net ([194.109.24.22]:35291 "EHLO lb1-smtp-cloud9.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730538AbfIBLqw (ORCPT ); Mon, 2 Sep 2019 07:46:52 -0400 Received: from [192.168.2.10] ([46.9.232.237]) by smtp-cloud9.xs4all.net with ESMTPA id 4knDidaguzaKO4knGiXWBB; Mon, 02 Sep 2019 13:46:50 +0200 Subject: Re: [RFC 10/12] media: hantro: Add support for H264 decoding on RK3399 To: Jonas Karlman , Ezequiel Garcia Cc: Mauro Carvalho Chehab , Boris Brezillon , Philipp Zabel , Paul Kocialkowski , "linux-media@vger.kernel.org" , "linux-rockchip@lists.infradead.org" , "linux-kernel@vger.kernel.org" References: <20190901124531.23645-1-jonas@kwiboo.se> From: Hans Verkuil Message-ID: <99943cdf-7e3b-f819-5d81-2e007e788682@xs4all.nl> Date: Mon, 2 Sep 2019 13:46:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfLcXWzujJMuvci893htW5/WH0F/hjHWkpTFnm1lpE6jVMZ59ZbS6Eni3lm0qlKUCmfvUXf6qHGyk2IEHuqBmSZoYZZymoYBlsbWur39VwOSFGABlHlOh 5vXpnNgjLuR1vHu25PXGdwLfaXhPgBLaxfVDPgqeTzIgkn5/REE30xKONjS1s25hl6DWtbikdXZPWPMNLQLMOohdOrgoRHO7izlXFfnDg/LBUNlGWANVrgbL qVHKJH+xn2AQHo2tRJ01VTj5obrHdS7y8ugriStMbqYSV0QlZcRg+41avsTPyOnzuDpKe2cFq4a17WFJWf2IsLRHdEjkXgaajZsY/U1YlR19KstUIsL3fO1T 7mcBwlE52DuB2xnJV8lervEKe0pAn+2mwI+Lvr3QF2EN8j9fkIizk2w0TW3L7LfpuNpd9e9czcc+D4cnKVau1QZhVAcm/9xVArmOyBsoN9bEx9EHDZ6+oa6T WZMUtkD2PGdJdRCd Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 9/1/19 2:45 PM, Jonas Karlman wrote: > Rockchip RK3399 SoC has the same Hantro G1 IP block > as RK3288, but the registers are entirely different. > > In a similar fashion as MPEG-2 and VP8 decoding, > it's simpler to just add a separate implementation. > > Signed-off-by: Jonas Karlman > --- > drivers/staging/media/hantro/Makefile | 1 + > .../staging/media/hantro/hantro_g1_h264_dec.c | 1 - > drivers/staging/media/hantro/hantro_hw.h | 1 + > .../media/hantro/rk3399_vpu_hw_h264_dec.c | 486 ++++++++++++++++++ > 4 files changed, 488 insertions(+), 1 deletion(-) > create mode 100644 drivers/staging/media/hantro/rk3399_vpu_hw_h264_dec.c > > diff --git a/drivers/staging/media/hantro/Makefile b/drivers/staging/media/hantro/Makefile > index 5d6b0383d280..8d33b0e8aa6c 100644 > --- a/drivers/staging/media/hantro/Makefile > +++ b/drivers/staging/media/hantro/Makefile > @@ -8,6 +8,7 @@ hantro-vpu-y += \ > hantro_g1_mpeg2_dec.o \ > hantro_g1_vp8_dec.o \ > rk3399_vpu_hw_jpeg_enc.o \ > + rk3399_vpu_hw_h264_dec.o \ > rk3399_vpu_hw_mpeg2_dec.o \ > rk3399_vpu_hw_vp8_dec.o \ > hantro_jpeg.o \ > diff --git a/drivers/staging/media/hantro/hantro_g1_h264_dec.c b/drivers/staging/media/hantro/hantro_g1_h264_dec.c > index 4b82b9fd5252..ec2736fb473d 100644 > --- a/drivers/staging/media/hantro/hantro_g1_h264_dec.c > +++ b/drivers/staging/media/hantro/hantro_g1_h264_dec.c > @@ -202,7 +202,6 @@ > #define G1_REG_REFBU_E(v) ((v) ? BIT(31) : 0) > > #define G1_REG_APF_THRESHOLD(v) (((v) << 0) & GENMASK(13, 0)) > ->>>>>>> b22734fb5e2c... Ymedia: hantro: Refactor G1 H264 code ^^^^^^^^^^^^^^^ Seems to be a left-over from patch 9? Regards, Hans > > void hantro_g1_h264_dec_run(struct hantro_ctx *ctx) > {