[pull] drm/msm: drm-msm-fixes-2023-03-09 for v6.3-rc2

Pull-request

https://gitlab.freedesktop.org/drm/msm.git tags/drm-msm-fixes-2023-03-09

Message

Rob Clark March 9, 2023, 7:38 p.m. UTC

Hi Dave,

A few fixes for v6.3.  Summary below.  There is a back-merge of
last-cycles -fixes to avoid a merge conflict in commit 6153c44392b0
("drm/msm/adreno: fix runtime PM imbalance at unbind")

The following changes since commit 92dd0575729a423aa5524d89055e34295152a2dd:

  Merge tag 'drm-msm-fixes-2023-01-16' into msm-fixes (2023-02-22
11:20:41 -0800)

are available in the Git repository at:

  https://gitlab.freedesktop.org/drm/msm.git tags/drm-msm-fixes-2023-03-09

for you to fetch changes up to a722511b18268bd1f7084eee243af416b85f288f:

  drm/msm: DEVFREQ_GOV_SIMPLE_ONDEMAND is no longer needed (2023-03-08
11:55:30 -0800)

----------------------------------------------------------------
msm-fixes for v6.3-rc2

- Fix for possible invalid ptr free in submit ioctl syncobj cleanup path.
- Synchronize GMU removal in driver teardown path
- a5xx preemption fixes
- Fix runpm imbalance at unbind
- DPU hw catalog fixes:
 - set DPU_MDP_PERIPH_0_REMOVED for sc8280xp as this is another chipset
   where the PERIPH_0 block of registers is not there
 - fix the DPU features supported in QCM2290 by comparing it with the
   downstream device tree
 - fix the length of registers in the sc7180_ctl from 0xe4 to 0x1dc
 - fix the max mixer line width for sm6115 and qcm2290 chipsets in the
   DPU catalog
 - fix the scaler version on sm8550, sc8280xp, sm8450, sm8250, sm8350
   and sm6115. This was incorrectly populated on the SW version of the
   scaler library and  not the scaler HW version
 - Drop dim layer support for msm8998 as its not indicated to be
   supported in the downstream DTSI
 - fix the DPU_CLK_CTRL bits for msm 8998 sspp blocks
 - Use DPU_CLK_CTRL_DMA* prefix instead of DPU_CLK_CTRL_CURSOR*
   for all chipsets for the DMA sspp blocks
 - fix the ping-pong block base address for sc7280 in the DPU HW catalog
- Fix stack corruption issue in the dpu_hw_ctl_setup_blendstage() function
  as it was causing a negative left shift by protecting against an invalid
  index
- Clear the DSPP reservations in dpu_rm_release(). This was missed out and
  as as result the DSPP was not released from the resource manager global
  state.

----------------------------------------------------------------
Dmitry Baryshkov (18):
      drm/msm/a5xx: fix setting of the CP_PREEMPT_ENABLE_LOCAL register
      drm/msm/a5xx: fix highest bank bit for a530
      drm/msm/a5xx: fix the emptyness check in the preempt code
      drm/msm/a5xx: fix context faults during ring switch
      drm/msm/dpu: set DPU_MDP_PERIPH_0_REMOVED for sc8280xp
      drm/msm/dpu: disable features unsupported by QCM2290
      drm/msm/dpu: fix typo in in sm8550's dma_sblk_5
      drm/msm/dpu: fix len of sc7180 ctl blocks
      drm/msm/dpu: fix sm6115 and qcm2290 mixer width limits
      drm/msm/dpu: correct sm8550 scaler
      drm/msm/dpu: correct sc8280xp scaler
      drm/msm/dpu: correct sm8450 scaler
      drm/msm/dpu: correct sm8250 and sm8350 scaler
      drm/msm/dpu: correct sm6115 scaler
      drm/msm/dpu: drop DPU_DIM_LAYER from MIXER_MSM8998_MASK
      drm/msm/dpu: fix clocks settings for msm8998 SSPP blocks
      drm/msm/dpu: don't use DPU_CLK_CTRL_CURSORn for DMA SSPP clocks
      drm/msm/dpu: fix stack smashing in dpu_hw_ctl_setup_blendstage

Douglas Anderson (1):
      drm/msm/a6xx: Make GPU destroy a bit safer

Johan Hovold (1):
      drm/msm/adreno: fix runtime PM imbalance at unbind

Kalyan Thota (1):
      drm/msm/dpu: clear DSPP reservations in rm release

Kuogee Hsieh (1):
      drm/msm/disp/dpu: fix sc7280_pp base offset

Randy Dunlap (1):
      drm/msm: DEVFREQ_GOV_SIMPLE_ONDEMAND is no longer needed

Rob Clark (1):
      drm/msm: Fix potential invalid ptr free

Thomas Zimmermann (1):
      drm/msm: Fix possible uninitialized access in fbdev

 drivers/gpu/drm/msm/Kconfig                    |   1 -
 drivers/gpu/drm/msm/adreno/a5xx_gpu.c          |   6 +-
 drivers/gpu/drm/msm/adreno/a5xx_preempt.c      |   4 +-
 drivers/gpu/drm/msm/adreno/a6xx_gmu.c          |   2 +-
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c          |   2 +
 drivers/gpu/drm/msm/adreno/adreno_device.c     |   3 +-
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 166 ++++++++++++-------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h |   2 +
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c     |   4 +-
 drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c         |   2 +
 drivers/gpu/drm/msm/msm_fbdev.c                |   4 +-
 drivers/gpu/drm/msm/msm_gem_submit.c           |   5 +-
 12 files changed, 103 insertions(+), 98 deletions(-)