diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-11-01 02:05:54 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-11-01 02:05:54 +0300 |
| commit | 5f7f8f6edbf860abf18149a64be036d4be5e2993 (patch) | |
| tree | 4dc508b8b13431758db78f7ada3e7d0a505c3323 /drivers/gpu/drm/exynos/exynos_drm_drv.c | |
| parent | a909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff) | |
| parent | 1cfa126c52af20c36e6a618e45c5449d1025ae55 (diff) | |
| download | linux-5f7f8f6edbf860abf18149a64be036d4be5e2993.tar.xz | |
Merge branch 'drm-fixes-staging' of ssh://people.freedesktop.org/~/linux into drm-fixes
Pull the staging fixes tree I had into rc3 to make real -fixes again.
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index def78c8c1780..f86e7c846678 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -262,6 +262,26 @@ int exynos_atomic_commit(struct drm_device *dev, struct drm_atomic_state *state, return 0; } +int exynos_atomic_check(struct drm_device *dev, + struct drm_atomic_state *state) +{ + int ret; + + ret = drm_atomic_helper_check_modeset(dev, state); + if (ret) + return ret; + + ret = drm_atomic_normalize_zpos(dev, state); + if (ret) + return ret; + + ret = drm_atomic_helper_check_planes(dev, state); + if (ret) + return ret; + + return ret; +} + static int exynos_drm_open(struct drm_device *dev, struct drm_file *file) { struct drm_exynos_file_private *file_priv; |