aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2015-11-30 08:53:24 -0500
committerInki Dae <daeinki@gmail.com>2015-12-13 08:22:56 -0500
commitab14420125c3cd1111f57731f0f9359c4e64d76a (patch)
tree868ab73847b9c3261bd45ab1b9957d4d559945c7
parent2ee35d8b53dc7187c6814bf79a08334b9b75ed59 (diff)
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>
-rw-r--r--drivers/gpu/drm/exynos/exynos_mixer.c3
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)
1167 const uint32_t *formats; 1167 const uint32_t *formats;
1168 unsigned int fcount; 1168 unsigned int fcount;
1169 1169
1170 if (zpos == VP_DEFAULT_WIN && !ctx->vp_enabled)
1171 continue;
1172
1170 if (zpos < VP_DEFAULT_WIN) { 1173 if (zpos < VP_DEFAULT_WIN) {
1171 formats = mixer_formats; 1174 formats = mixer_formats;
1172 fcount = ARRAY_SIZE(mixer_formats); 1175 fcount = ARRAY_SIZE(mixer_formats);