[pull] drm/msm: drm-msm-fixes-2023-05-17 for v6.4-rc3

Pull-request

https://gitlab.freedesktop.org/drm/msm.git tags/drm-msm-fixes-2023-05-17

Message

Rob Clark May 17, 2023, 4:16 p.m. UTC

Hi Dave,

A few fixes for v6.4, summary below.  One arm-smmu-qcom fix to
un-break GPU per-process page-tables which was broken by a small
refactor in arm-smmu-qcom.  (Also added some WARN()s to make this sort
of breakage more obvious in the future.)

The following changes since commit ac7e7c9c65ecfb1fcc99de91cfd6b17a8d4cb9c1:

  drm/msm/dpu: drop unused macros from hw catalog (2023-04-07 03:54:50 +0300)

are available in the Git repository at:

  https://gitlab.freedesktop.org/drm/msm.git tags/drm-msm-fixes-2023-05-17

for you to fetch changes up to 5c054db54c43a5fcb5cc81012361f5e3fac37637:

  drm/msm: Be more shouty if per-process pgtables aren't working
(2023-05-17 08:53:47 -0700)

----------------------------------------------------------------
msm-fixes for v6.4-rc3

Display Fixes:

+ Catalog fixes:
 - fix the programmable fetch lines and qos settings of msm8998
   to match what is present downstream
 - fix the LM pairs for msm8998 to match what is present downstream.
   The current settings are not right as LMs with incompatible
   connected blocks are paired
 - remove unused INTF0 interrupt mask from SM6115/QCM2290 as there
   is no INTF0 present on those chipsets. There is only one DSI on
   index 1
 - remove TE2 block from relevant chipsets because this is mainly
   used for ping-pong split feature which is not supported upstream
   and also for the chipsets where we are removing them in this
   change, that block is not present as the tear check has been moved
   to the intf block
 - relocate non-MDP_TOP INTF_INTR offsets from dpu_hwio.h to
   dpu_hw_interrupts.c to match where they belong
 - fix the indentation for REV_7xxx interrupt masks
 - fix the offset and version for dither blocks of SM8[34]50/SC8280XP
   chipsets as it was incorrect
 - make the ping-pong blk length 0 for appropriate chipsets as those
   chipsets only have a dither ping-pong dither block but no other
   functionality in the base ping-pong
 - remove some duplicate register defines from INTF
+ Fix the log mask for the writeback block so that it can be enabled
  correctly via debugfs
+ unregister the hdmi codec for dp during unbind otherwise it leaks
  audio codec devices
+ Yaml change to fix warnings related to 'qcom,master-dsi' and
  'qcom,sync-dual-dsi'

GPU Fixes:

+ fix submit error path leak
+ arm-smmu-qcom fix for regression that broke per-process page tables
+ fix no-iommu crash

----------------------------------------------------------------
Arnaud Vrac (2):
      drm/msm/dpu: tweak msm8998 hw catalog values
      drm/msm/dpu: tweak lm pairings in msm8998 hw catalog

Jianhua Lu (1):
      dt-bindings: display/msm: dsi-controller-main: Document qcom,
master-dsi and qcom, sync-dual-dsi

Luca Weiss (1):
      drm/msm/iommu: Fix null pointer dereference in no-IOMMU case

Marijn Suijten (9):
      drm/msm/dpu: Assign missing writeback log_mask
      drm/msm/dpu: Remove unused INTF0 interrupt mask from SM6115/QCM2290
      drm/msm/dpu: Remove TE2 block and feature from DPU >= 5.0.0 hardware
      drm/msm/dpu: Move non-MDP_TOP INTF_INTR offsets out of hwio header
      drm/msm/dpu: Reindent REV_7xxx interrupt masks with tabs
      drm/msm/dpu: Fix PP_BLK_DIPHER -> DITHER typo
      drm/msm/dpu: Use V2 DITHER PINGPONG sub-block in SM8[34]50/SC8280XP
      drm/msm/dpu: Set PINGPONG block length to zero for DPU >= 7.0.0
      drm/msm/dpu: Remove duplicate register defines from INTF

Rob Clark (5):
      drm/msm/atomic: Don't try async if crtc not active
      drm/msm: Fix vmap madv warning
      drm/msm: Fix submit error-path leaks
      iommu/arm-smmu-qcom: Fix missing adreno_smmu's
      drm/msm: Be more shouty if per-process pgtables aren't working

Srinivas Kandagatla (1):
      drm/msm/dp: unregister audio driver during unbind

 .../bindings/display/msm/dsi-controller-main.yaml  | 12 +++++++++++
 .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h    | 16 +++++++-------
 .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h |  4 ++--
 .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h    |  4 ++--
 .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h |  4 ++--
 .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h |  4 ++--
 .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h |  1 -
 .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h    |  1 -
 .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 12 +++++------
 .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h |  8 +++----
 .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h   | 24 ++++++++++-----------
 .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 16 +++++++-------
 .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 16 +++++++-------
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c     | 17 ++++++---------
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c  | 23 +++++++++++---------
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c        |  5 -----
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c          |  1 +
 drivers/gpu/drm/msm/disp/dpu1/dpu_hwio.h           |  3 ---
 drivers/gpu/drm/msm/dp/dp_audio.c                  | 12 +++++++++++
 drivers/gpu/drm/msm/dp/dp_audio.h                  |  2 ++
 drivers/gpu/drm/msm/dp/dp_display.c                |  1 +
 drivers/gpu/drm/msm/msm_atomic.c                   |  2 ++
 drivers/gpu/drm/msm/msm_gem.c                      | 22 +++++++------------
 drivers/gpu/drm/msm/msm_gem_submit.c               | 25 ++++++++++++++++------
 drivers/gpu/drm/msm/msm_iommu.c                    |  9 ++++++--
 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c         | 10 +++++++++
 26 files changed, 146 insertions(+), 108 deletions(-)