Merge branch 'msm-next-lumag-dpu' into msm-next-lumag
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Thu, 6 Apr 2023 17:29:50 +0000 (20:29 +0300)
committerDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Thu, 6 Apr 2023 17:29:50 +0000 (20:29 +0300)
commit2470e93289af9df0efc9695a126b87aeeabb0c1c
tree2e5449d48de71e0f56122237e3a020c49e18eab2
parent6ec593812f9c08de303675aa3d5cf07df33e4290
parentc6c6556857e229c8c117c3b7aaee33b6f5d03c57
Merge branch 'msm-next-lumag-dpu' into msm-next-lumag

Merge DPU changes, resolving conflicts between branches. Full changelog
will be present in the final merge commit.

DPU:
 - DSPP sub-block flush on sc7280
 - support AR30 in addition to XR30 format
 - Allow using REC_0 and REC_1 to handle wide (4k) RGB planes

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
drivers/gpu/drm/msm/msm_drv.c
drivers/gpu/drm/msm/msm_drv.h