diff options
| author | Sean Paul <seanpaul@chromium.org> | 2019-03-06 09:22:18 -0500 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2019-03-06 09:22:18 -0500 |
| commit | cd7d3a1bb42e0756b17ccfafbd956ca7ed757846 (patch) | |
| tree | fb76fd0ccaaaa3f27ef0a06ecf3d04ebe9d4025d /drivers/gpu/drm/imx/imx-drm-core.c | |
| parent | 6b5c029df5e40704a6642e026e709dd0dec44622 (diff) | |
| parent | 4b057e73f28f1df13b77b77a52094238ffdf8abd (diff) | |
Merge drm/drm-next into drm-misc-next
Picking up v5.0 + missed misc-fixes from last release
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/imx/imx-drm-core.c')
| -rw-r--r-- | drivers/gpu/drm/imx/imx-drm-core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index 4d8e7685706e..3e8bece620df 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -49,11 +49,7 @@ static int imx_drm_atomic_check(struct drm_device *dev, { int ret; - ret = drm_atomic_helper_check_modeset(dev, state); - if (ret) - return ret; - - ret = drm_atomic_helper_check_planes(dev, state); + ret = drm_atomic_helper_check(dev, state); if (ret) return ret; @@ -229,6 +225,7 @@ static int imx_drm_bind(struct device *dev) drm->mode_config.funcs = &imx_drm_mode_config_funcs; drm->mode_config.helper_private = &imx_drm_mode_config_helpers; drm->mode_config.allow_fb_modifiers = true; + drm->mode_config.normalize_zpos = true; drm_mode_config_init(drm); |