diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2015-11-30 16:53:24 +0300 |
|---|---|---|
| committer | Inki Dae <daeinki@gmail.com> | 2015-12-13 16:22:56 +0300 |
| commit | ab14420125c3cd1111f57731f0f9359c4e64d76a (patch) | |
| tree | 868ab73847b9c3261bd45ab1b9957d4d559945c7 /drivers/gpu/drm/exynos/exynos_mixer.c | |
| parent | 2ee35d8b53dc7187c6814bf79a08334b9b75ed59 (diff) | |
| download | linux-ab14420125c3cd1111f57731f0f9359c4e64d76a.tar.xz | |
drm/exynos: mixer: enable video overlay plane only when VP is available
Video overlay plane should be registered only when suitable hardware
sub-block (Video Processor) is available.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_mixer.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 84ee3396c429..8d2ce13eb725 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -1167,6 +1167,9 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data) const uint32_t *formats; unsigned int fcount; + if (zpos == VP_DEFAULT_WIN && !ctx->vp_enabled) + continue; + if (zpos < VP_DEFAULT_WIN) { formats = mixer_formats; fcount = ARRAY_SIZE(mixer_formats); |