From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.1 Message-ID: <5eb31abf-07f4-474d-936b-b1d3397e7991@altlinux.org> Date: Sat, 20 Sep 2025 22:20:56 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: devel-kernel@lists.altlinux.org References: <3576f69a-bf90-4590-9ff0-361cad6bb5d8@altlinux.org> Content-Language: ru, en-US From: Anton Midyukov In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [d-kernel] [PATCH 00/30] [6.12] Enable HDMI0 support on rk3588 and same other improvements from v6.14 X-BeenThere: devel-kernel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux kernel packages development List-Id: ALT Linux kernel packages development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Sep 2025 19:20:59 -0000 Archived-At: List-Archive: List-Post: 20.09.2025 22:16, Vitaly Chikunov пишет: > Anton, > > On Sat, Sep 20, 2025 at 09:10:25PM +0300, Anton Midyukov wrote: >> 29.04.2025 14:22, Vitaly Chikunov пишет: >>> Anton, >>> >>> Зачем нам применять эти патчи мимо апстрима, мы не Редхат, чтоб >>> сопровождать свой форк ядра, а полагаемся на лучшие stable ядра от >>> Linux Foundation. >>> >>> В качестве теста я попытался применить этот патчет ко >>> kernel-image-6.12-6.12.1-alt1 - вылезло три merge conflicts в >>> >>> arm64: dts: rockchip: refactor common Orange Pi 5 board >>> arm64: dts: rockchip: enable the mmu600_pcie IOMMU on the rk3588 SoC >>> arm64: dts: rockchip: disable IOMMU when running rk3588 in PCIe endpoint mode >>> >>> Их этого можно сделать вывод, что он и дальше будет вызывать проблемы с merge >>> conflicts. >>> >>> Если считаете, что эти патчи должны быть а 6.12, пошлите их, пожалуйста, в >>> stable. >>> >> >> Прошло почти пять месяцев, а патчи так и не отвалились. Может быть примите? > > Да, не отвалились и код в целом практически не влияет на другой. > Вы _будете_ помогать решать merge conflicts когда они возникнут в будущем? > Да, буду. Я понимаю, что беру на себя ответственность, предлагая такой большой патч. >> >>> Thanks, >>> >>> On Tue, Apr 22, 2025 at 01:04:19PM +0300, Anton Midyukov wrote: >>>> Andy Yan (3): >>>> arm64: dts: rockchip: Enable HDMI0 for rk3588 Cool Pi CM5 EVB >>>> arm64: dts: rockchip: Enable HDMI display for rk3588 Cool Pi 4B >>>> arm64: dts: rockchip: Enable HDMI display for rk3588 Cool Pi GenBook >>>> >>>> Anton Midyukov (1): >>>> config-aarch64: CONFIG_ROCKCHIP_DW_HDMI_QP=y >>>> >>>> Arnd Bergmann (1): >>>> drm/rockchip: avoid 64-bit division >>>> >>>> Cenk Uluisik (1): >>>> arm64: dts: rockchip: refactor common Orange Pi 5 board >>>> >>>> Chen-Yu Tsai (1): >>>> arm64: dts: rockchip: orangepi-5-plus: Enable GPU >>>> >>>> Cristian Ciocaltea (8): >>>> drm/bridge: synopsys: Add DW HDMI QP TX Controller support library >>>> dt-bindings: display: rockchip: Add schema for RK3588 HDMI TX >>>> Controller >>>> drm/rockchip: Add basic RK3588 HDMI output support >>>> arm64: dts: rockchip: Add HDMI0 node to rk3588 >>>> arm64: dts: rockchip: Enable HDMI0 on rock-5b >>>> arm64: dts: rockchip: Enable HDMI0 on rk3588-evb1 >>>> arm64: dts: rockchip: Enable HDMI0 on orangepi-5-plus >>>> arm64: dts: rockchip: Enable HDMI0 on rock-5a >>>> >>>> FUKAUMI Naoki (2): >>>> arm64: dts: rockchip: add and enable gpu node for Radxa ROCK 5A >>>> arm64: dts: rockchip: rename rfkill label for Radxa ROCK 5B >>>> >>>> Heiko Stuebner (3): >>>> arm64: dts: rockchip: add HDMI pinctrl to rk3588-tiger SoM >>>> arm64: dts: rockchip: add HDMI support to rk3588-tiger-haikou >>>> arm64: dts: rockchip: add HDMI support to rk3588-jaguar >>>> >>>> Jianfeng Liu (1): >>>> arm64: dts: rockchip: slow down emmc freq for rock 5 itx >>>> >>>> Jimmy Hon (4): >>>> arm64: dts: rockchip: Enable HDMI0 on Orange Pi 5 >>>> arm64: dts: rockchip: analog audio on Orange Pi 5 >>>> arm64: dts: rockchip: reorder audio/hdmi nodes in Orange Pi 5 >>>> arm64: dts: rockchip: pwm-leds for Orange Pi 5 >>>> >>>> Jonas Karlman (2): >>>> arm64: dts: rockchip: Enable HDMI0 on FriendlyElec CM3588 NAS >>>> arm64: dts: rockchip: Enable HDMI on Hardkernel ODROID-M2 >>>> >>>> Marcin Juszkiewicz (1): >>>> arm64: dts: rockchip: Enable HDMI0 on rk3588-nanopc-t6 >>>> >>>> Niklas Cassel (2): >>>> arm64: dts: rockchip: enable the mmu600_pcie IOMMU on the rk3588 SoC >>>> arm64: dts: rockchip: disable IOMMU when running rk3588 in PCIe >>>> endpoint mode >>>> >>>> .../rockchip/rockchip,rk3588-dw-hdmi-qp.yaml | 188 ++++ >>>> arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 44 +- >>>> .../dts/rockchip/rk3588-coolpi-cm5-evb.dts | 47 + >>>> .../rockchip/rk3588-coolpi-cm5-genbook.dts | 49 + >>>> .../boot/dts/rockchip/rk3588-evb1-v10.dts | 47 + >>>> .../arm64/boot/dts/rockchip/rk3588-extra.dtsi | 3 + >>>> .../rk3588-friendlyelec-cm3588-nas.dts | 47 + >>>> .../arm64/boot/dts/rockchip/rk3588-jaguar.dts | 50 + >>>> .../boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 47 + >>>> .../dts/rockchip/rk3588-orangepi-5-plus.dts | 52 ++ >>>> .../boot/dts/rockchip/rk3588-rock-5-itx.dts | 3 +- >>>> .../dts/rockchip/rk3588-rock-5b-pcie-ep.dtso | 4 + >>>> .../boot/dts/rockchip/rk3588-rock-5b.dts | 49 +- >>>> .../boot/dts/rockchip/rk3588-tiger-haikou.dts | 53 ++ >>>> .../arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 6 + >>>> .../boot/dts/rockchip/rk3588s-coolpi-4b.dts | 47 + >>>> .../boot/dts/rockchip/rk3588s-odroid-m2.dts | 47 + >>>> .../boot/dts/rockchip/rk3588s-orangepi-5.dts | 735 +-------------- >>>> .../boot/dts/rockchip/rk3588s-orangepi-5.dtsi | 855 ++++++++++++++++++ >>>> .../boot/dts/rockchip/rk3588s-rock-5a.dts | 57 ++ >>>> config-aarch64 | 1 + >>>> drivers/gpu/drm/bridge/synopsys/Kconfig | 8 + >>>> drivers/gpu/drm/bridge/synopsys/Makefile | 2 + >>>> drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 647 +++++++++++++ >>>> drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 834 +++++++++++++++++ >>>> drivers/gpu/drm/rockchip/Kconfig | 9 + >>>> drivers/gpu/drm/rockchip/Makefile | 1 + >>>> .../gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 424 +++++++++ >>>> drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 + >>>> drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + >>>> include/drm/bridge/dw_hdmi_qp.h | 32 + >>>> 31 files changed, 3653 insertions(+), 738 deletions(-) >>>> create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml >>>> create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi >>>> create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c >>>> create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h >>>> create mode 100644 drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c >>>> create mode 100644 include/drm/bridge/dw_hdmi_qp.h >>>> >>>> -- >>>> 2.42.4 >>>> >>>> _______________________________________________ >>>> devel-kernel mailing list >>>> devel-kernel@lists.altlinux.org >>>> https://lists.altlinux.org/mailman/listinfo/devel-kernel >>> _______________________________________________ >>> devel-kernel mailing list >>> devel-kernel@lists.altlinux.org >>> https://lists.altlinux.org/mailman/listinfo/devel-kernel >> >> -- >> best regards, Anton Midyukov >> >> _______________________________________________ >> devel-kernel mailing list >> devel-kernel@lists.altlinux.org >> https://lists.altlinux.org/mailman/listinfo/devel-kernel > _______________________________________________ > devel-kernel mailing list > devel-kernel@lists.altlinux.org > https://lists.altlinux.org/mailman/listinfo/devel-kernel -- best regards, Anton Midyukov