diff options
| author | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2023-04-06 20:29:50 +0300 |
|---|---|---|
| committer | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2023-04-06 20:29:50 +0300 |
| commit | 2470e93289af9df0efc9695a126b87aeeabb0c1c (patch) | |
| tree | 2e5449d48de71e0f56122237e3a020c49e18eab2 /drivers/gpu/drm/msm/msm_drv.c | |
| parent | 6ec593812f9c08de303675aa3d5cf07df33e4290 (diff) | |
| parent | c6c6556857e229c8c117c3b7aaee33b6f5d03c57 (diff) | |
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>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 29ba4bfda24b..b4cfa44a8a5c 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -58,7 +58,7 @@ 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, + .atomic_check = msm_atomic_check, .atomic_commit = drm_atomic_helper_commit, }; |