diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-02-28 03:53:11 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-02-28 03:53:16 +0100 |
| commit | 7fbd5d784f75750199c21918da9b2fc92af371e6 (patch) | |
| tree | 330e44c21a8affa5f10bcaea46dc0461319a8ff3 /drivers/gpu/drm/imx/imx-drm-core.c | |
| parent | Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into... (diff) | |
| parent | drm/imx: only send commit done event when all state has been applied (diff) | |
| download | linux-7fbd5d784f75750199c21918da9b2fc92af371e6.tar.xz linux-7fbd5d784f75750199c21918da9b2fc92af371e6.zip | |
Merge tag 'imx-drm-next-2019-02-22' of git://git.pengutronix.de/pza/linux into drm-next
drm/imx: handle pending updates better, add plane zpos property support
- Add a mechanism to only send commit done events once all pending
updates have been applied. This closes a small race window where
already armed events could fire even though the double buffered
hardware update just missed the update window.
- Add plane zpos property support to allow placing the overlay plane
behind the primary plane.
- Allow building imx-drm on all platforms under COMPILE_TEST.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Philipp Zabel <pza@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20190222112350.m3ucezilqx6cyest@pengutronix.de
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 44da0f5d0ed9..c935cbe059a7 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); |