From patchwork Tue Aug 30 15:57:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 601397 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32AACECAAA1 for ; Tue, 30 Aug 2022 15:58:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230370AbiH3P56 (ORCPT ); Tue, 30 Aug 2022 11:57:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230363AbiH3P55 (ORCPT ); Tue, 30 Aug 2022 11:57:57 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C50CB6D32 for ; Tue, 30 Aug 2022 08:57:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B535BB81CCE for ; Tue, 30 Aug 2022 15:57:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04483C433D6; Tue, 30 Aug 2022 15:57:52 +0000 (UTC) Message-ID: <4f2f28c5-d5af-5c11-94ea-69a6aaf23e79@xs4all.nl> Date: Tue, 30 Aug 2022 17:57:51 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.1.2 Content-Language: en-US To: "linux-media@vger.kernel.org" Cc: Ezequiel Garcia From: Hans Verkuil Subject: [GIT PULL FOR v6.1] Move hantro to mainline Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This is the third attempt since the previous two PRs failed to be picked up by patchwork. While at it I also rebased on top of the latest staging tree. Hopefully third time is a charm... Hans The following changes since commit 61890ccaefaff89f5babd2c8412fd222c3f5fe38: media: platform: mtk-mdp3: add MediaTek MDP3 driver (2022-08-30 16:25:51 +0200) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-v6.1k for you to fetch changes up to 22216e780853129b0fcce2abec6a724bebcc6882: media: destage Hantro VPU driver (2022-08-30 17:38:32 +0200) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Ezequiel Garcia (1): media: destage Hantro VPU driver MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 1 + drivers/media/platform/Makefile | 1 + drivers/{staging/media/hantro => media/platform/verisilicon}/Kconfig | 6 +++++- drivers/{staging/media/hantro => media/platform/verisilicon}/Makefile | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro.h | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_drv.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_h264_dec.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_mpeg2_dec.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_regs.h | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_vp8_dec.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_hevc_dec.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_regs.h | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_vp9_dec.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h1_jpeg_enc.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h1_regs.h | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h264.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_hevc.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_hw.h | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_jpeg.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_jpeg.h | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_mpeg2.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_postproc.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_v4l2.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_v4l2.h | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp8.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp9.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp9.h | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/imx8m_vpu_hw.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_h264_dec.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_jpeg_enc.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_mpeg2_dec.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_vp8_dec.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_regs.h | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu_hw.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/sama5d4_vdec_hw.c | 0 drivers/{staging/media/hantro => media/platform/verisilicon}/sunxi_vpu_hw.c | 0 drivers/staging/media/Kconfig | 2 -- drivers/staging/media/Makefile | 1 - drivers/staging/media/hantro/TODO | 2 -- 42 files changed, 8 insertions(+), 7 deletions(-) rename drivers/{staging/media/hantro => media/platform/verisilicon}/Kconfig (91%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/Makefile (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro.h (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_drv.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_h264_dec.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_mpeg2_dec.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_regs.h (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_vp8_dec.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_hevc_dec.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_regs.h (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_vp9_dec.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h1_jpeg_enc.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h1_regs.h (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h264.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_hevc.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_hw.h (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_jpeg.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_jpeg.h (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_mpeg2.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_postproc.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_v4l2.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_v4l2.h (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp8.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp9.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp9.h (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/imx8m_vpu_hw.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_h264_dec.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_jpeg_enc.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_mpeg2_dec.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_vp8_dec.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_regs.h (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu_hw.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/sama5d4_vdec_hw.c (100%) rename drivers/{staging/media/hantro => media/platform/verisilicon}/sunxi_vpu_hw.c (100%) delete mode 100644 drivers/staging/media/hantro/TODO