Merge tag 'drm-msm-next-2020-03-22' of https://gitlab.freedesktop.org/drm/msm into...

A bit smaller this time around.. there are still a couple uabi
additions for vulkan waiting in the wings, but I punted on them this
cycle due to running low on time.  (They should be easy enough to
rebase, and if it is a problem for anyone I can push a next+uabi
branch so that tu work can proceed.)

The bigger change is refactoring dpu resource manager and moving dpu
to use atomic global state.  Other than that, it is mostly cleanups
and fixes.

From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_drv.c
Simple merge