From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Mon, 30 Nov 2015 13:53:24 +0000 (+0100)
Subject: drm/exynos: mixer: enable video overlay plane only when VP is available
X-Git-Tag: submit/tizen/20160622.123456~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38dfae57d4466a3b3c66a60d7fc97ad835ab668b;p=platform%2Fkernel%2Flinux-exynos.git

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>
[backport of mainline commit ab14420125c3cd1111f57731f0f9359c4e64d76a
 to let Enlightenment to use video/osd graphics plane]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I0636d35a660960015816224ceb19f6c7fb6abe26
---

diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 55d4fcddc3a2..930ed9ce018f 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -42,6 +42,7 @@
 #include "exynos_mixer.h"
 
 #define MIXER_WIN_NR		3
+#define VP_DEFAULT_WIN		2
 #define MIXER_DEFAULT_WIN	0
 
 /* The pixelformats that are natively supported by the mixer. */
@@ -1233,6 +1234,8 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data)
 		return ret;
 
 	for (zpos = 0; zpos < MIXER_WIN_NR; zpos++) {
+		if (zpos == VP_DEFAULT_WIN && !ctx->vp_enabled)
+			continue;
 		type = (zpos == MIXER_DEFAULT_WIN) ? DRM_PLANE_TYPE_PRIMARY :
 						DRM_PLANE_TYPE_OVERLAY;
 		ret = exynos_plane_init(drm_dev, &ctx->planes[zpos],