mbox series

[GIT,PULL,FOR,v6.1] Move hantro to mainline

Message ID 4f2f28c5-d5af-5c11-94ea-69a6aaf23e79@xs4all.nl (mailing list archive)
State New, archived
Headers show
Series [GIT,PULL,FOR,v6.1] Move hantro to mainline | expand

Pull-request

git://linuxtv.org/hverkuil/media_tree.git tags/br-v6.1k

Message

Hans Verkuil Aug. 30, 2022, 3:57 p.m. UTC
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