Merge tag 'drm-msm-next-2019-11-05' of https://gitlab.freedesktop.org/drm/msm into...
authorDave Airlie <airlied@redhat.com>
Mon, 2 Dec 2019 00:14:35 +0000 (10:14 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 2 Dec 2019 00:21:12 +0000 (10:21 +1000)
commit36a170b1ca0da12641b1d847524f17b4aa2a2283
tree925b84af22798759249af133ad555dce611d1bfa
parentacc61b8929365e63a3e8c8c8913177795aa45594
parente20c9284c8f212081afc28471daaac9b0d54252f
Merge tag 'drm-msm-next-2019-11-05' of https://gitlab.freedesktop.org/drm/msm into drm-next

+ OCMEM support to enable the couple generations that had shared OCMEM
  rather than GMEM exclusively for the GPU (late a3xx and I think basically
  all of a4xx).  Bjorn and Brian decided to land this through the drm
  tree to avoid having to coordinate merge requests.
+ a510 support, and various associated display support
+ the usual misc cleanups and fixes

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
drivers/gpu/drm/msm/dsi/dsi_host.c