From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Date: Thu, 6 Apr 2023 17:29:50 +0000 (+0300)
Subject: Merge branch 'msm-next-lumag-dpu' into msm-next-lumag
X-Git-Tag: v6.6.7~1918^2~4^2~233
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2470e93289af9df0efc9695a126b87aeeabb0c1c;p=platform%2Fkernel%2Flinux-starfive.git

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>
---

2470e93289af9df0efc9695a126b87aeeabb0c1c
diff --cc drivers/gpu/drm/msm/msm_drv.c
index 29ba4bf,ecf42f4..b4cfa44
--- a/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,
  };