From patchwork Tue Nov 10 13:23:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 7590821 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 007DA9F443 for ; Tue, 10 Nov 2015 13:25:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1477320793 for ; Tue, 10 Nov 2015 13:25:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 24371207B6 for ; Tue, 10 Nov 2015 13:25:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753119AbbKJNY5 (ORCPT ); Tue, 10 Nov 2015 08:24:57 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:11119 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753085AbbKJNYz (ORCPT ); Tue, 10 Nov 2015 08:24:55 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NXL00GMPP9HV0A0@mailout4.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 10 Nov 2015 13:24:54 +0000 (GMT) X-AuditID: cbfec7f4-f79c56d0000012ee-6d-5641f025a300 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id A9.23.04846.520F1465; Tue, 10 Nov 2015 13:24:53 +0000 (GMT) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NXL00L9RP94NP10@eusync1.samsung.com>; Tue, 10 Nov 2015 13:24:53 +0000 (GMT) From: Marek Szyprowski To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Andrzej Hajda , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Tobias Jakobi , Gustavo Padovan , Javier Martinez Canillas Subject: [PATCH 13/25] drm/exynos: mixer: enable video overlay plane only when VP is available Date: Tue, 10 Nov 2015 14:23:29 +0100 Message-id: <1447161821-1877-14-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1447161821-1877-1-git-send-email-m.szyprowski@samsung.com> References: <1447161821-1877-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJLMWRmVeSWpSXmKPExsVy+t/xy7qqHxzDDGYvVLa4te4cq8XGGetZ La58fc9msfPBLnaLSfcnsFi8ebuGyeLFvYssFq9fGFrMOL+PyWLtkbvsFjMmv2SzaFv9gdVi 1a4/jA68Hjtn3WX3uN99nMnj3zF2jy39QN7OSXuZPPq2rGL0+LxJLoA9issmJTUnsyy1SN8u gStj+55H7AUH2Spmfs9rYNzJ2sXIySEhYCLx6FAPC4QtJnHh3nq2LkYuDiGBpYwS+1Y3M0E4 TUwSf/5fYgapYhMwlOh628UGYosIuEk0HZ4JNolZ4DCzxOGpdSC2sECCRPuURrB6FgFViStN P8FqeAU8JPbN+MgMsU1O4v/LFUwgNidQfOvHz2BxIQF3iZtNF1kmMPIuYGRYxSiaWppcUJyU nmuoV5yYW1yal66XnJ+7iRESoF92MC4+ZnWIUYCDUYmHd8I3hzAh1sSy4srcQ4wSHMxKIryM rx3DhHhTEiurUovy44tKc1KLDzFKc7AoifPO3fU+REggPbEkNTs1tSC1CCbLxMEp1cAYfDdz 8Qubb0FlUef6H315rj4ty/vjQ48c29c7DvLOeCIl8Ur+zkSBlT7XXgYH6xvx/9OOvJgycdPO 7wqtsoZvnPiOf9GUKN2wfN+Uw2ur10apWs9L+i6ewP70zTsT1idWczzmarJa/V5450pZTrCm zcmsBwtKLcS3bizzfyf2WOEI52SZtfXHlViKMxINtZiLihMBYJRZ4EwCAAA= Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 a683edce5b68..015e85cabcc9 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -1205,6 +1205,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);