Merge remote-tracking branch 'drm/drm-next' into msm-next

Merge drm-next into msm-next to pick up external clk and PM dependencies for improved a6xx GPU reset sequence. Signed-off-by: Rob Clark <robdclark@chromium.org>
2026-11-10 20:48:12 +00:00 · 2023-03-20 10:31:25 -07:00 · 2023-03-20 10:31:25 -07:00 · e752ab11dc
commit e752ab11dc
parent 1844e680d5 8bf6e20253
14356 changed files with 1027930 additions and 891030 deletions
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
--- a/include/acpi/cppc_acpi.h
+++ b/include/acpi/cppc_acpi.h
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
--- a/include/acpi/platform/acenvex.h
+++ b/include/acpi/platform/acenvex.h
--- a/include/acpi/platform/acintel.h
+++ b/include/acpi/platform/acintel.h
--- a/include/asm-generic/agp.h
+++ b/include/asm-generic/agp.h
--- a/include/asm-generic/cmpxchg-local.h
+++ b/include/asm-generic/cmpxchg-local.h
--- a/include/asm-generic/dma-mapping.h
+++ b/include/asm-generic/dma-mapping.h
--- a/include/asm-generic/error-injection.h
+++ b/include/asm-generic/error-injection.h
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
--- a/include/asm-generic/hugetlb.h
+++ b/include/asm-generic/hugetlb.h
--- a/include/asm-generic/hyperv-tlfs.h
+++ b/include/asm-generic/hyperv-tlfs.h
--- a/include/asm-generic/memory_model.h
+++ b/include/asm-generic/memory_model.h
--- a/include/asm-generic/mshyperv.h
+++ b/include/asm-generic/mshyperv.h
--- a/include/asm-generic/page.h
+++ b/include/asm-generic/page.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/crypto/aead.h
+++ b/include/crypto/aead.h
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
--- a/include/crypto/internal/acompress.h
+++ b/include/crypto/internal/acompress.h
--- a/include/crypto/internal/aead.h
+++ b/include/crypto/internal/aead.h
--- a/include/crypto/internal/akcipher.h
+++ b/include/crypto/internal/akcipher.h
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
--- a/include/crypto/internal/kpp.h
+++ b/include/crypto/internal/kpp.h
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
--- a/include/crypto/xts.h
+++ b/include/crypto/xts.h
--- a/include/drm/display/drm_dp.h
+++ b/include/drm/display/drm_dp.h
--- a/include/drm/display/drm_dp_mst_helper.h
+++ b/include/drm/display/drm_dp_mst_helper.h
--- a/include/drm/drm_accel.h
+++ b/include/drm/drm_accel.h
--- a/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
--- a/include/drm/drm_bridge_connector.h
+++ b/include/drm/drm_bridge_connector.h
--- a/include/drm/drm_client.h
+++ b/include/drm/drm_client.h
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
--- a/include/drm/drm_debugfs.h
+++ b/include/drm/drm_debugfs.h
--- a/include/drm/drm_device.h
+++ b/include/drm/drm_device.h
--- a/include/drm/drm_displayid.h
+++ b/include/drm/drm_displayid.h
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
--- a/include/drm/drm_fixed.h
+++ b/include/drm/drm_fixed.h
--- a/include/drm/drm_format_helper.h
+++ b/include/drm/drm_format_helper.h
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
--- a/include/drm/drm_gem_shmem_helper.h
+++ b/include/drm/drm_gem_shmem_helper.h
--- a/include/drm/drm_mipi_dsi.h
+++ b/include/drm/drm_mipi_dsi.h
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
--- a/include/drm/drm_of.h
+++ b/include/drm/drm_of.h
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
--- a/include/drm/drm_plane_helper.h
+++ b/include/drm/drm_plane_helper.h
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
--- a/include/drm/drm_suballoc.h
+++ b/include/drm/drm_suballoc.h
--- a/include/drm/drm_vma_manager.h
+++ b/include/drm/drm_vma_manager.h
--- a/include/drm/gpu_scheduler.h
+++ b/include/drm/gpu_scheduler.h
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
--- a/include/drm/ttm/ttm_bo.h
+++ b/include/drm/ttm/ttm_bo.h
--- a/include/drm/ttm/ttm_device.h
+++ b/include/drm/ttm/ttm_device.h
--- a/include/dt-bindings/arm/qcom,ids.h
+++ b/include/dt-bindings/arm/qcom,ids.h
--- a/include/dt-bindings/clock/imx6qdl-clock.h
+++ b/include/dt-bindings/clock/imx6qdl-clock.h
--- a/include/dt-bindings/clock/imx6sll-clock.h
+++ b/include/dt-bindings/clock/imx6sll-clock.h
--- a/include/dt-bindings/clock/imx6ul-clock.h
+++ b/include/dt-bindings/clock/imx6ul-clock.h
--- a/include/dt-bindings/clock/imx8ulp-clock.h
+++ b/include/dt-bindings/clock/imx8ulp-clock.h
--- a/include/dt-bindings/clock/loongson,ls2k-clk.h
+++ b/include/dt-bindings/clock/loongson,ls2k-clk.h
--- a/include/dt-bindings/clock/mediatek,mt7981-clk.h
+++ b/include/dt-bindings/clock/mediatek,mt7981-clk.h
--- a/include/dt-bindings/clock/qcom,gcc-apq8084.h
+++ b/include/dt-bindings/clock/qcom,gcc-apq8084.h
--- a/include/dt-bindings/clock/qcom,gcc-qcs404.h
+++ b/include/dt-bindings/clock/qcom,gcc-qcs404.h
--- a/include/dt-bindings/clock/qcom,gcc-sm8350.h
+++ b/include/dt-bindings/clock/qcom,gcc-sm8350.h
--- a/include/dt-bindings/clock/qcom,gcc-sm8450.h
+++ b/include/dt-bindings/clock/qcom,gcc-sm8450.h
--- a/include/dt-bindings/clock/qcom,qdu1000-gcc.h
+++ b/include/dt-bindings/clock/qcom,qdu1000-gcc.h
--- a/include/dt-bindings/clock/qcom,rpmcc.h
+++ b/include/dt-bindings/clock/qcom,rpmcc.h
--- a/include/dt-bindings/clock/qcom,sa8775p-gcc.h
+++ b/include/dt-bindings/clock/qcom,sa8775p-gcc.h
--- a/include/dt-bindings/clock/qcom,sm6350-camcc.h
+++ b/include/dt-bindings/clock/qcom,sm6350-camcc.h
--- a/include/dt-bindings/clock/qcom,sm8550-dispcc.h
+++ b/include/dt-bindings/clock/qcom,sm8550-dispcc.h
--- a/include/dt-bindings/clock/qcom,sm8550-tcsr.h
+++ b/include/dt-bindings/clock/qcom,sm8550-tcsr.h
--- a/include/dt-bindings/clock/s3c2410.h
+++ b/include/dt-bindings/clock/s3c2410.h
--- a/include/dt-bindings/clock/s3c2412.h
+++ b/include/dt-bindings/clock/s3c2412.h
--- a/include/dt-bindings/clock/s3c2443.h
+++ b/include/dt-bindings/clock/s3c2443.h
--- a/include/dt-bindings/clock/stih416-clks.h
+++ b/include/dt-bindings/clock/stih416-clks.h
--- a/include/dt-bindings/clock/sun20i-d1-ccu.h
+++ b/include/dt-bindings/clock/sun20i-d1-ccu.h
--- a/include/dt-bindings/firmware/qcom,scm.h
+++ b/include/dt-bindings/firmware/qcom,scm.h
--- a/include/dt-bindings/gpio/gpio.h
+++ b/include/dt-bindings/gpio/gpio.h
--- a/include/dt-bindings/interconnect/qcom,qdu1000-rpmh.h
+++ b/include/dt-bindings/interconnect/qcom,qdu1000-rpmh.h
--- a/include/dt-bindings/interconnect/qcom,sa8775p-rpmh.h
+++ b/include/dt-bindings/interconnect/qcom,sa8775p-rpmh.h
--- a/include/dt-bindings/interconnect/qcom,sc7180.h
+++ b/include/dt-bindings/interconnect/qcom,sc7180.h
--- a/include/dt-bindings/interconnect/qcom,sc8180x.h
+++ b/include/dt-bindings/interconnect/qcom,sc8180x.h
--- a/include/dt-bindings/interconnect/qcom,sc8280xp.h
+++ b/include/dt-bindings/interconnect/qcom,sc8280xp.h
--- a/include/dt-bindings/interconnect/qcom,sdm670-rpmh.h
+++ b/include/dt-bindings/interconnect/qcom,sdm670-rpmh.h
--- a/include/dt-bindings/interconnect/qcom,sdx55.h
+++ b/include/dt-bindings/interconnect/qcom,sdx55.h
--- a/include/dt-bindings/interconnect/qcom,sm8150.h
+++ b/include/dt-bindings/interconnect/qcom,sm8150.h
--- a/include/dt-bindings/interconnect/qcom,sm8250.h
+++ b/include/dt-bindings/interconnect/qcom,sm8250.h
--- a/include/dt-bindings/interconnect/qcom,sm8550-rpmh.h
+++ b/include/dt-bindings/interconnect/qcom,sm8550-rpmh.h
--- a/include/dt-bindings/pinctrl/k3.h
+++ b/include/dt-bindings/pinctrl/k3.h
--- a/include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
+++ b/include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
--- a/include/dt-bindings/power/allwinner,sun20i-d1-ppu.h
+++ b/include/dt-bindings/power/allwinner,sun20i-d1-ppu.h
--- a/include/dt-bindings/power/mediatek,mt8188-power.h
+++ b/include/dt-bindings/power/mediatek,mt8188-power.h
--- a/include/dt-bindings/power/meson-g12a-power.h
+++ b/include/dt-bindings/power/meson-g12a-power.h
--- a/include/dt-bindings/power/qcom-rpmpd.h
+++ b/include/dt-bindings/power/qcom-rpmpd.h
--- a/Show more
+++ b/Show more