Hi Dave, Sima, This is the main pull for v6.11. It includes a merge of the immutable tag qcom/20240430-a750-raytracing-v3-2-7f57c5ac082d@xxxxxxxxx to pick up dependencies for raytracing and SMEM speedbin. Further description below. The following changes since commit 92815da4576a495cb6362cdfb132152fccc2222d: Merge remote-tracking branch 'drm-misc/drm-misc-next' into HEAD (2024-06-12 16:52:39 +0300) are available in the Git repository at: https://gitlab.freedesktop.org/drm/msm.git tags/drm-msm-next-2024-07-04 for you to fetch changes up to fe34394ecdad459d2d7b1f30e4a39ac27fcd77f8: dt-bindings: display/msm: dsi-controller-main: Add SM7150 (2024-07-03 05:57:35 -0700) ---------------------------------------------------------------- Updates for v6.11 Core: - SM7150 support DPU: - SM7150 support - Fix DSC support for DSI panels in video mode - Fixed TE vsync source support for DSI command-mode panels - Fix for devices without UBWC in the display controller (ie. QCM2290) DSI: - Remove unused register-writing wrappers - Fix DSC support for panels in video mode - Add support for parsing TE vsync source - Add support for MSM8937 (28nm DSI PHY) MDP5: - Add support for MSM8937 - Fix configuration for MSM8953 GPU: - Split giant device table into per-gen "hw catalog" similar to what is done on the display side of the driver - Fix a702 UBWC mode - Fix unused variably warnings - GPU memory traces - Add param for userspace to know if raytracing is supported - Memory barrier cleanup and GBIF unhalt fix - X185 support (aka gpu in X1 laptop chips) - a505 support - fixes ---------------------------------------------------------------- Abhinav Kumar (3): drm/msm/a6xx: use __unused__ to fix compiler warnings for gen7_* includes drm/msm/dpu: drop validity checks for clear_pending_flush() ctl op drm/msm/dpu: check ubwc support before adding compressed formats Akhil P Oommen (3): dt-bindings: display/msm/gmu: Add Adreno X185 GMU drm/msm/adreno: Add support for X185 GPU drm/msm/adreno: Introduce gmu_chipid for a740 & a750 Barnabás Czémán (4): drm/msm/dpu: guard ctl irq callback register/unregister drm/msm/mdp5: Remove MDP_CAP_SRC_SPLIT from msm8x53_config dt-bindings: display/msm: qcom, mdp5: Add msm8937 compatible dt-bindings: msm: dsi-phy-28nm: Document msm8937 compatible Connor Abbott (5): firmware: qcom: scm: Add gpu_init_regs call firmware: qcom_scm: Add gpu_init_regs call drm/msm/a7xx: Initialize a750 "software fuse" drm/msm: Add MSM_PARAM_RAYTRACING uapi drm/msm/a7xx: Add missing register writes from downstream Daniil Titov (3): drm/msm/mdp5: Add MDP5 configuration for MSM8937 drm/msm/dsi: Add phy configuration for MSM8937 drm/msm/adreno: Add support for Adreno 505 GPU Danila Tikhonov (5): dt-bindings: display/msm: Add SM7150 DPU drm/msm/dpu: Add SM7150 support dt-bindings: display/msm: Add SM7150 MDSS drm/msm: mdss: Add SM7150 support dt-bindings: display/msm: dsi-controller-main: Add SM7150 Dmitry Baryshkov (9): dt-bindings: display/msm/dsi: allow specifying TE source drm/msm/dpu: convert vsync source defines to the enum drm/msm/dsi: drop unused GPIOs handling drm/msm/dpu: pull the is_cmd_mode out of _dpu_encoder_update_vsync_source() drm/msm/dpu: rework vsync_source handling drm/msm/dsi: parse vsync source from device tree drm/msm/dpu: support setting the TE source drm/msm/dpu: rename dpu_hw_setup_vsync_source functions drm/msm/dpu: remove CRTC frame event callback registration Jani Nikula (1): drm/msm/dp: switch to struct drm_edid Jonathan Marek (4): drm/msm/dpu: fix video mode DSC for DSI drm/msm/dsi: set video mode widebus enable bit when widebus is enabled drm/msm/dsi: set VIDEO_COMPRESSION_MODE_CTRL_WC drm/msm/dsi: add a comment to explain pkt_per_line encoding Jun Nie (2): drm/msm/dpu: adjust data width for widen bus case drm/msm/dpu: enable compression bit in cfg2 for DSC Konrad Dybcio (7): drm/msm/a6xx: Fix A702 UBWC mode soc: qcom: Move some socinfo defines to the header soc: qcom: smem: Add a feature code getter drm/msm/dsi: Remove dsi_phy_read/write() drm/msm/dsi: Remove dsi_phy_write_[un]delay() drm/msm/adreno: De-spaghettify the use of memory barriers Revert "drm/msm/a6xx: Poll for GBIF unhalt status in hw_init" Krzysztof Kozlowski (4): dt-bindings: display/msm/gpu: constrain clocks in top-level dt-bindings: display/msm/gpu: define reg-names in top-level dt-bindings: display/msm/gpu: simplify compatible regex dt-bindings: display/msm/gpu: fix the schema being not applied Neil Armstrong (2): drm/msm/adreno: fix a7xx gpu init drm/msm/adreno: fix a743 and a740 cx mem init Rob Clark (11): drm/msm/adreno: Split up giant device table drm/msm/adreno: Split catalog into separate files drm/msm/adreno: Move hwcg regs to a6xx hw catalog drm/msm/adreno: Move hwcg table into a6xx specific info drm/msm/adreno: Move CP_PROTECT settings to hw catalog drm/msm: Add GPU memory traces drm/msm: Add obj flags to gpu devcoredump drm/msm/adreno: Check for zap node availability Merge remote-tracking branch 'qcom/20240430-a750-raytracing-v3-2-7f57c5ac082d@xxxxxxxxx' into msm-next-robclark drm/msm/a6xx: Add missing __always_unused drm/msm/gem: Add missing rcu_dereference() .../bindings/display/msm/dsi-controller-main.yaml | 19 + .../bindings/display/msm/dsi-phy-28nm.yaml | 1 + .../devicetree/bindings/display/msm/gmu.yaml | 4 + .../devicetree/bindings/display/msm/gpu.yaml | 27 +- .../devicetree/bindings/display/msm/qcom,mdp5.yaml | 1 + .../devicetree/bindings/display/msm/qcom,mdss.yaml | 1 + .../bindings/display/msm/qcom,sm7150-dpu.yaml | 143 +++ .../bindings/display/msm/qcom,sm7150-mdss.yaml | 458 +++++++ drivers/firmware/qcom/qcom_scm.c | 14 + drivers/firmware/qcom/qcom_scm.h | 3 + drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/Makefile | 5 + drivers/gpu/drm/msm/adreno/a2xx_catalog.c | 52 + drivers/gpu/drm/msm/adreno/a3xx_catalog.c | 81 ++ drivers/gpu/drm/msm/adreno/a4xx_catalog.c | 50 + drivers/gpu/drm/msm/adreno/a5xx_catalog.c | 161 +++ drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 29 +- drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 1259 ++++++++++++++++++++ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 38 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 995 ++-------------- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 12 + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 13 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 624 +--------- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 6 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 44 +- .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 335 ++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 25 +- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 57 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 15 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 8 + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 4 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 21 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 19 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 5 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 26 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 14 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 45 + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 7 +- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 91 +- drivers/gpu/drm/msm/dp/dp_display.c | 11 +- drivers/gpu/drm/msm/dp/dp_panel.c | 47 +- drivers/gpu/drm/msm/dp/dp_panel.h | 2 +- drivers/gpu/drm/msm/dsi/dsi.h | 1 + drivers/gpu/drm/msm/dsi/dsi_host.c | 59 +- drivers/gpu/drm/msm/dsi/dsi_manager.c | 5 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 6 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 273 ++--- drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 218 ++-- drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 109 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 323 ++--- drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 205 ++-- drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 320 +++-- drivers/gpu/drm/msm/msm_drv.h | 11 + drivers/gpu/drm/msm/msm_gem.c | 37 + drivers/gpu/drm/msm/msm_gpu.c | 6 +- drivers/gpu/drm/msm/msm_gpu.h | 9 + drivers/gpu/drm/msm/msm_mdss.c | 8 + drivers/soc/qcom/smem.c | 33 + drivers/soc/qcom/socinfo.c | 8 - include/linux/firmware/qcom/qcom_scm.h | 23 + include/linux/soc/qcom/smem.h | 1 + include/linux/soc/qcom/socinfo.h | 34 + include/uapi/drm/msm_drm.h | 1 + 71 files changed, 4011 insertions(+), 2470 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm7150-dpu.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm7150-mdss.yaml create mode 100644 drivers/gpu/drm/msm/adreno/a2xx_catalog.c create mode 100644 drivers/gpu/drm/msm/adreno/a3xx_catalog.c create mode 100644 drivers/gpu/drm/msm/adreno/a4xx_catalog.c create mode 100644 drivers/gpu/drm/msm/adreno/a5xx_catalog.c create mode 100644 drivers/gpu/drm/msm/adreno/a6xx_catalog.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
