[GIT PULL FOR v5.18] Clean up "mediatek,larb"

Hans Verkuil hverkuil at xs4all.nl
Sat Jan 22 00:40:44 PST 2022


Hi Mauro,

This is the PR of v10 of this series, minus patches 12 and 13 (Matthias will take those
once this is merged for 5.18):

https://patchwork.linuxtv.org/project/linux-media/cover/20220117070510.17642-1-yong.wu@mediatek.com/

The first two patches are from:

https://patchwork.linuxtv.org/project/linux-media/patch/20211206130425.184420-1-hsinyi@chromium.org/
https://patchwork.linuxtv.org/project/linux-media/patch/20211206130425.184420-2-hsinyi@chromium.org/

since the v10 series depends on that yaml conversion.

This series touches on several subsystems. I believe I have all the relevant Acks etc.
It made the most sense to merge this through the media subsystem since that's the main
target for these changes.

Regards,

	Hans


The following changes since commit 216a6d4965287400d40227601abb6cedcd2addd3:

  media: mtk-vcodec: Remove mtk_vcodec_release_enc_pm (2022-01-21 12:23:48 +0100)

are available in the Git repository at:

  git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.18g

for you to fetch changes up to ae04f1335521a2d8b917c0e4708280e9819ed0e9:

  memory: mtk-smi: Get rid of mtk_smi_larb_get/put (2022-01-22 09:20:30 +0100)

----------------------------------------------------------------
Tag branch

----------------------------------------------------------------
Hsin-Yi Wang (2):
      dt-bindings: mediatek: convert mtk jpeg decoder/encoder to yaml
      dt-bindings: mediatek: Add mediatek, mt8183-jpgenc compatible

Yong Wu (10):
      dt-binding: mediatek: Get rid of mediatek,larb for multimedia HW
      iommu/mediatek-v1: Free the existed fwspec if the master dev already has
      iommu/mediatek: Return ENODEV if the device is NULL
      iommu/mediatek: Add probe_defer for smi-larb
      iommu/mediatek: Add device_link between the consumer and the larb devices
      media: mtk-jpeg: Get rid of mtk_smi_larb_get/put
      media: mtk-mdp: Get rid of mtk_smi_larb_get/put
      drm/mediatek: Get rid of mtk_smi_larb_get/put
      media: mtk-vcodec: Get rid of mtk_smi_larb_get/put
      memory: mtk-smi: Get rid of mtk_smi_larb_get/put

Yongqiang Niu (1):
      drm/mediatek: Add pm runtime support for ovl and rdma

 Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt |  9 ------
 Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml |  7 -----
 Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml |  8 ------
 Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt    | 38 ------------------------
 Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.yaml   | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++
 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt    | 35 ----------------------
 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml   | 72 ++++++++++++++++++++++++++++++++++++++++++++++
 Documentation/devicetree/bindings/media/mediatek-mdp.txt             |  8 ------
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c                              |  8 +++++-
 drivers/gpu/drm/mediatek/mtk_disp_rdma.c                             |  9 +++++-
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c                              | 15 +++++-----
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c                          | 36 ++---------------------
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h                          |  1 -
 drivers/gpu/drm/mediatek/mtk_drm_drv.c                               |  5 +---
 drivers/iommu/mtk_iommu.c                                            | 34 ++++++++++++++++++++++
 drivers/iommu/mtk_iommu_v1.c                                         | 42 ++++++++++++++++++++++++++-
 drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c                      | 45 ++---------------------------
 drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h                      |  2 --
 drivers/media/platform/mtk-mdp/mtk_mdp_comp.c                        | 40 --------------------------
 drivers/media/platform/mtk-mdp/mtk_mdp_comp.h                        |  2 --
 drivers/media/platform/mtk-mdp/mtk_mdp_core.c                        |  1 -
 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c               |  2 --
 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c                |  1 -
 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c                | 41 ++++----------------------
 drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h                   |  3 --
 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c                   |  1 -
 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c               |  2 --
 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c                | 45 ++++-------------------------
 drivers/memory/mtk-smi.c                                             | 14 ---------
 include/soc/mediatek/smi.h                                           | 20 -------------
 30 files changed, 267 insertions(+), 359 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
 create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.yaml
 delete mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
 create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml



More information about the Linux-mediatek mailing list