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 <[email protected]>

diff --cc drivers/gpu/drm/msm/msm_drv.c
index 29ba4bfda24b7f87956382e1e9e8db99555183c5,ecf42f40f28916ef34fb80d4595301ef753cd71d..b4cfa44a8a5c479618d8e92fa871fbad42b1b929
--- 1/drivers/gpu/drm/msm/msm_drv.c
--- 2/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@@ -54,11 -52,10 +54,11 @@@
  #define MSM_VERSION_MINOR     10
  #define MSM_VERSION_PATCHLEVEL        0
  
 +static void msm_deinit_vram(struct drm_device *ddev);
 +
  static const struct drm_mode_config_funcs mode_config_funcs = {
        .fb_create = msm_framebuffer_create,
-       .atomic_check = drm_atomic_helper_check,
 -      .output_poll_changed = drm_fb_helper_output_poll_changed,
+       .atomic_check = msm_atomic_check,
        .atomic_commit = drm_atomic_helper_commit,
  };
  

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