From ab14420125c3cd1111f57731f0f9359c4e64d76a Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Mon, 30 Nov 2015 14:53:24 +0100 Subject: [PATCH] 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 Reviewed-by: Gustavo Padovan Signed-off-by: Inki Dae --- drivers/gpu/drm/exynos/exynos_mixer.c | 3 +++ 1 file changed, 3 insertions(+) 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); -- 2.20.1