diff options
| author |   Dave Airlie <airlied@redhat.com> | 2015-12-20 08:51:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-20 08:51:34 +1000 |
| commit | 1957d62c29be413d77da2e69737f4251e5449fbd (patch) | |
| tree | 22488a4c08adf182091fbad9a8e1d071cf70e251 | |
| parent | Merge branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes (diff) | |
| parent | drm/exynos: atomic check only enabled crtc states (diff) | |
| download | linux-dev-1957d62c29be413d77da2e69737f4251e5449fbd.tar.xz linux-dev-1957d62c29be413d77da2e69737f4251e5449fbd.zip | |
Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes
just one regression fix.
* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
drm/exynos: atomic check only enabled crtc states
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_crtc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index b3ba27fd9a6b..e69357172ffb 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -55,6 +55,9 @@ static int exynos_crtc_atomic_check(struct drm_crtc *crtc, { struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); + if (!state->enable) + return 0; + if (exynos_crtc->ops->atomic_check) return exynos_crtc->ops->atomic_check(exynos_crtc, state); |