| Message ID | 20221126102141.721353-1-dmitry.baryshkov@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [pull] drm/msm: drm-msm-display-for-6.2 | expand |
On Sat, 26 Nov 2022 at 20:21, Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > > Hi Dave, > > As agreed with Rob Clark, a pull request for the non-GPU part of the drm/msm driver. Summary below. > > The following changes since commit 7f7a942c0a338c4a2a7b359bdb2b68e9896122ec: > > Merge tag 'drm-next-20221025' of git://linuxtv.org/pinchartl/media into drm-next (2022-10-27 14:44:15 +1000) > > are available in the Git repository at: > > https://gitlab.freedesktop.org/lumag/msm.git tags/drm-msm-display-for-6.2 > > for you to fetch changes up to 8d1d17d47eaebe4466459846d07e4ba8953fa585: > > Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi' and 'msm-next-lumag-mdp5' into msm-next-lumag (2022-11-26 12:06:29 +0200) > > ---------------------------------------------------------------- > drm/msm updates for 6.2 > > Core: > - MSM_INFO_GET_FLAGS support > - Cleaned up MSM IOMMU wrapper code > > DPU: > - Added support for XR30 and P010 image formats > - Reworked MDSS/DPU schema, added SM8250 MDSS bindings > - Added Qualcomm SM6115 support > > DP: > - Dropped unsane sanity checks > > DSI: > - Fix calculation of DSC pps payload > > DSI PHY: > - DSI PHY support for QCM2290 > > HDMI: > - Reworked dev init path > > ---------------------------------------------------------------- > Adam Skladowski (2): > dt-bindings: display/msm: add support for SM6115 > drm/msm/disp/dpu1: add support for display on SM6115 > > Bryan O'Donoghue (1): > dt-bindings: msm: dsi-controller-main: Drop redundant phy-names > > Dan Carpenter (1): > drm/msm/hdmi: remove unnecessary NULL check > > Dmitry Baryshkov (25): > Merge remote-tracking branch 'msm/msm-fixes' into HEAD This commit has no justification or signed off by line, I'll let it slide this once, but no backmerges without justification and please sign off merges. Dave.
On Wed, 30 Nov 2022 at 09:02, Dave Airlie <airlied@gmail.com> wrote: > > On Sat, 26 Nov 2022 at 20:21, Dmitry Baryshkov > <dmitry.baryshkov@linaro.org> wrote: > > > > Hi Dave, > > > > As agreed with Rob Clark, a pull request for the non-GPU part of the drm/msm driver. Summary below. > > > > The following changes since commit 7f7a942c0a338c4a2a7b359bdb2b68e9896122ec: > > > > Merge tag 'drm-next-20221025' of git://linuxtv.org/pinchartl/media into drm-next (2022-10-27 14:44:15 +1000) > > > > are available in the Git repository at: > > > > https://gitlab.freedesktop.org/lumag/msm.git tags/drm-msm-display-for-6.2 > > > > for you to fetch changes up to 8d1d17d47eaebe4466459846d07e4ba8953fa585: > > > > Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi' and 'msm-next-lumag-mdp5' into msm-next-lumag (2022-11-26 12:06:29 +0200) > > > > ---------------------------------------------------------------- > > drm/msm updates for 6.2 > > > > Core: > > - MSM_INFO_GET_FLAGS support > > - Cleaned up MSM IOMMU wrapper code > > > > DPU: > > - Added support for XR30 and P010 image formats > > - Reworked MDSS/DPU schema, added SM8250 MDSS bindings > > - Added Qualcomm SM6115 support > > > > DP: > > - Dropped unsane sanity checks > > > > DSI: > > - Fix calculation of DSC pps payload > > > > DSI PHY: > > - DSI PHY support for QCM2290 > > > > HDMI: > > - Reworked dev init path > > > > ---------------------------------------------------------------- > > Adam Skladowski (2): > > dt-bindings: display/msm: add support for SM6115 > > drm/msm/disp/dpu1: add support for display on SM6115 > > > > Bryan O'Donoghue (1): > > dt-bindings: msm: dsi-controller-main: Drop redundant phy-names > > > > Dan Carpenter (1): > > drm/msm/hdmi: remove unnecessary NULL check > > > > Dmitry Baryshkov (25): > > Merge remote-tracking branch 'msm/msm-fixes' into HEAD > > This commit has no justification or signed off by line, I'll let it > slide this once, but no backmerges without justification and please > sign off merges. Roger.
Hi Dave, As agreed with Rob Clark, a pull request for the non-GPU part of the drm/msm driver. Summary below. The following changes since commit 7f7a942c0a338c4a2a7b359bdb2b68e9896122ec: Merge tag 'drm-next-20221025' of git://linuxtv.org/pinchartl/media into drm-next (2022-10-27 14:44:15 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/lumag/msm.git tags/drm-msm-display-for-6.2 for you to fetch changes up to 8d1d17d47eaebe4466459846d07e4ba8953fa585: Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi' and 'msm-next-lumag-mdp5' into msm-next-lumag (2022-11-26 12:06:29 +0200) ---------------------------------------------------------------- drm/msm updates for 6.2 Core: - MSM_INFO_GET_FLAGS support - Cleaned up MSM IOMMU wrapper code DPU: - Added support for XR30 and P010 image formats - Reworked MDSS/DPU schema, added SM8250 MDSS bindings - Added Qualcomm SM6115 support DP: - Dropped unsane sanity checks DSI: - Fix calculation of DSC pps payload DSI PHY: - DSI PHY support for QCM2290 HDMI: - Reworked dev init path ---------------------------------------------------------------- Adam Skladowski (2): dt-bindings: display/msm: add support for SM6115 drm/msm/disp/dpu1: add support for display on SM6115 Bryan O'Donoghue (1): dt-bindings: msm: dsi-controller-main: Drop redundant phy-names Dan Carpenter (1): drm/msm/hdmi: remove unnecessary NULL check Dmitry Baryshkov (25): Merge remote-tracking branch 'msm/msm-fixes' into HEAD drm/msm: less magic numbers in msm_mdss_enable drm/msm/mdp5: stop overriding drvdata dt-bindings: display/msm: split qcom, mdss bindings dt-bindings: display/msm: add gcc-bus clock to dpu-smd845 dt-bindings: display/msm: add interconnects property to qcom, mdss-smd845 dt-bindings: display/msm: move common DPU properties to dpu-common.yaml dt-bindings: display/msm: move common MDSS properties to mdss-common.yaml dt-bindings: display/msm: split dpu-sc7180 into DPU and MDSS parts dt-bindings: display/msm: split dpu-sc7280 into DPU and MDSS parts dt-bindings: display/msm: split dpu-sdm845 into DPU and MDSS parts dt-bindings: display/msm: split dpu-msm8998 into DPU and MDSS parts dt-bindings: display/msm: split dpu-qcm2290 into DPU and MDSS parts dt-bindings: display/msm: add missing device nodes to mdss-* schemas dt-bindings: display/msm: add support for the display on SM8250 drm/msm/hdmi: use devres helper for runtime PM management drm/msm/hdmi: drop constant resource names from platform config drm/msm: move domain allocation into msm_iommu_new() drm/msm: remove duplicated code from a6xx_create_address_space drm/msm/hdmi: move resource allocation to probe function drm/msm/hdmi: don't take extra reference on PHY device drm/msm/hdmi: move msm_hdmi_get_phy() to msm_hdmi_dev_probe() dt-bindings: display/msm/dsi-controller-main: allow defining opp-table drm/msm/mdp5: fix reading hw revision on db410c platform Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi' and 'msm-next-lumag-mdp5' into msm-next-lumag Jessica Zhang (2): drm/msm/dpu: Add support for XR30 format drm/msm/dpu: Add support for P010 format Johan Hovold (2): drm/msm/dp: drop modeset sanity checks drm/msm/dsi: drop modeset sanity checks Kuogee Hsieh (2): drm/msm/dp: replace variable err with len at dp_aux_link_power_up() drm/msm/dp: retry 3 times if set sink to D0 poweer state failed Liu Shixin (1): drm/msm/dpu: use DEFINE_SHOW_ATTRIBUTE to simplify dpu_regset32 Loic Poulain (2): dt-bindings: display/msm: Add QCM2290 DSI phy drm/msm/dsi: Add phy configuration for QCM2290 Marijn Suijten (11): drm/msm/dpu1: Account for DSC's bits_per_pixel having 4 fractional bits drm/msm/dsi: Remove useless math in DSC calculations drm/msm/dsi: Remove repeated calculation of slice_per_intf drm/msm/dsi: Use DIV_ROUND_UP instead of conditional increment on modulo drm/msm/dsi: Reuse earlier computed dsc->slice_chunk_size drm/msm/dsi: Appropriately set dsc->mux_word_size based on bpc drm/msm/dsi: Migrate to drm_dsc_compute_rc_parameters() drm/msm/dsi: Account for DSC's bits_per_pixel having 4 fractional bits drm/msm/dsi: Disallow 8 BPC DSC configuration for alternative BPC values drm/msm/dpu1: Account for DSC's bits_per_pixel having 4 fractional bits drm/msm/dsi: Prevent signed BPG offsets from bleeding into adjacent bits Rob Clark (1): drm/msm: Add MSM_INFO_GET_FLAGS Robert Foss (1): drm/msm/dpu: Refactor sc7280_pp location .../bindings/display/msm/dpu-common.yaml | 52 +++ .../bindings/display/msm/dpu-msm8998.yaml | 223 ----------- .../bindings/display/msm/dpu-qcm2290.yaml | 222 ----------- .../bindings/display/msm/dpu-sc7180.yaml | 235 ------------ .../bindings/display/msm/dpu-sc7280.yaml | 239 ------------ .../bindings/display/msm/dpu-sdm845.yaml | 217 ----------- .../bindings/display/msm/dsi-controller-main.yaml | 5 +- .../bindings/display/msm/dsi-phy-14nm.yaml | 1 + .../devicetree/bindings/display/msm/mdp5.txt | 30 +- .../bindings/display/msm/mdss-common.yaml | 83 ++++ .../devicetree/bindings/display/msm/qcom,mdss.yaml | 196 ++++++++++ .../bindings/display/msm/qcom,msm8998-dpu.yaml | 95 +++++ .../bindings/display/msm/qcom,msm8998-mdss.yaml | 268 +++++++++++++ .../bindings/display/msm/qcom,qcm2290-dpu.yaml | 84 ++++ .../bindings/display/msm/qcom,qcm2290-mdss.yaml | 198 ++++++++++ .../bindings/display/msm/qcom,sc7180-dpu.yaml | 95 +++++ .../bindings/display/msm/qcom,sc7180-mdss.yaml | 304 +++++++++++++++ .../bindings/display/msm/qcom,sc7280-dpu.yaml | 98 +++++ .../bindings/display/msm/qcom,sc7280-mdss.yaml | 422 +++++++++++++++++++++ .../bindings/display/msm/qcom,sdm845-dpu.yaml | 90 +++++ .../bindings/display/msm/qcom,sdm845-mdss.yaml | 270 +++++++++++++ .../bindings/display/msm/qcom,sm6115-dpu.yaml | 94 +++++ .../bindings/display/msm/qcom,sm6115-mdss.yaml | 182 +++++++++ .../bindings/display/msm/qcom,sm8250-dpu.yaml | 92 +++++ .../bindings/display/msm/qcom,sm8250-mdss.yaml | 330 ++++++++++++++++ drivers/gpu/drm/msm/Kconfig | 2 +- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 12 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 33 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 14 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 10 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 36 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 9 +- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 24 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 104 ++++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 11 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 19 +- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 19 +- .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 5 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 27 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 13 +- drivers/gpu/drm/msm/dp/dp_display.c | 23 +- drivers/gpu/drm/msm/dp/dp_drm.c | 34 ++ drivers/gpu/drm/msm/dp/dp_link.c | 21 +- drivers/gpu/drm/msm/dp/dp_parser.c | 6 +- drivers/gpu/drm/msm/dp/dp_parser.h | 5 +- drivers/gpu/drm/msm/dsi/dsi.c | 9 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 121 ++---- drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 17 + drivers/gpu/drm/msm/hdmi/hdmi.c | 359 ++++++++---------- drivers/gpu/drm/msm/hdmi/hdmi.h | 3 - drivers/gpu/drm/msm/msm_drv.c | 29 +- drivers/gpu/drm/msm/msm_gem_submit.c | 9 +- drivers/gpu/drm/msm/msm_gpu.c | 2 + drivers/gpu/drm/msm/msm_gpu.h | 4 + drivers/gpu/drm/msm/msm_iommu.c | 20 +- drivers/gpu/drm/msm/msm_mdss.c | 85 ++++- drivers/gpu/drm/msm/msm_mmu.h | 3 +- drivers/gpu/drm/msm/msm_ringbuffer.c | 3 +- include/uapi/drm/msm_drm.h | 1 + 66 files changed, 3602 insertions(+), 1627 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-common.yaml delete mode 100644 Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml delete mode 100644 Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml delete mode 100644 Documentation/devicetree/bindings/display/msm/dpu-sc7180.yaml delete mode 100644 Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml delete mode 100644 Documentation/devicetree/bindings/display/msm/dpu-sdm845.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/mdss-common.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,msm8998-dpu.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,msm8998-mdss.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,qcm2290-dpu.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sc7180-dpu.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sc7280-dpu.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sdm845-dpu.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6115-dpu.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8250-dpu.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml