[pull] drm/msm: drm-msm-fixes-2021-04-02 for v5.12-rc6

[Rob Clark]

Hi Dave & Daniel,

A couple more small fixes for v5.12

The following changes since commit 627dc55c273dab308303a5217bd3e767d7083ddb:

  drm/msm/disp/dpu1: icc path needs to be set before dpu runtime
resume (2021-03-22 18:52:34 -0700)

are available in the Git repository at:

  https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes-2021-04-02

for you to fetch changes up to 12aca1ce9ee33af3751aec5e55a5900747cbdd4b:

  drm/msm/disp/dpu1: program 3d_merge only if block is attached
(2021-04-02 08:23:41 -0700)

----------------------------------------------------------------
Dmitry Baryshkov (1):
      drm/msm: a6xx: fix version check for the A650 SQE microcode

John Stultz (1):
      drm/msm: Fix removal of valid error case when checking speed_bin

Kalyan Thota (1):
      drm/msm/disp/dpu1: program 3d_merge only if block is attached

Rob Clark (1):
      drm/msm: Fix a5xx/a6xx timestamps

Stephen Boyd (1):
      drm/msm: Set drvdata to NULL when msm_drm_init() fails

 drivers/gpu/drm/msm/adreno/a5xx_gpu.c      |  4 ++--
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c      | 18 ++++++++++++------
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c |  4 +++-
 drivers/gpu/drm/msm/msm_drv.c              |  1 +
 4 files changed, 18 insertions(+), 9 deletions(-)