Merge tag 'drm-msm-next-2020-03-22' of https://gitlab.freedesktop.org/drm/msm into...
authorDave Airlie <airlied@redhat.com>
Tue, 31 Mar 2020 06:34:49 +0000 (16:34 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 31 Mar 2020 06:34:55 +0000 (16:34 +1000)
commit59e7a8cc2dcf335116d500d684bfb34d1d97a6fe
tree5359c4fe5df3a646f2b4873bce2c666a14eea783
parent5fc0df93fccd4dc8412bfc488ba4ba8268aa12dc
parenta5fb8b918920c6f7706a8b5b8ea535a7f077a7f6
Merge tag 'drm-msm-next-2020-03-22' of https://gitlab.freedesktop.org/drm/msm into drm-next

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>
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
drivers/gpu/drm/msm/msm_drv.c