From patchwork Wed Jul 25 15:46:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10544195 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B1C3FA517 for ; Wed, 25 Jul 2018 15:47:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A10FE2A508 for ; Wed, 25 Jul 2018 15:47:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94C522A54D; Wed, 25 Jul 2018 15:47:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2ECE02A508 for ; Wed, 25 Jul 2018 15:47:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728600AbeGYQ7R (ORCPT ); Wed, 25 Jul 2018 12:59:17 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:33551 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728568AbeGYQ7R (ORCPT ); Wed, 25 Jul 2018 12:59:17 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20180725154701euoutp01ea1a6f0bbd66f8128ca959c0317c700f~EpzWQRcp41687316873euoutp01h; Wed, 25 Jul 2018 15:47:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20180725154701euoutp01ea1a6f0bbd66f8128ca959c0317c700f~EpzWQRcp41687316873euoutp01h DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1532533621; bh=ic3qNtoq51bQUkB+tC4AheocFQdN9kl6T9RIQSBGcrw=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=QWgoXrdEk3F9QaZWZdQ3+UksyZM9TE9jZ5UnuXque0sMWW2QuBgEf12aIu0c2+ISD KK6deDwtUPpYpPx3EvltYRmPeLCTjmJDV7bMHHqdNQ3PZKciLsozfafHk6JZ7d5ZNY MJ9xheFmYnj3P3pBDGYc4C6RQnZa3IqqU07Bbvis= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180725154701eucas1p2eba5018129c29fe2d8042c2055505d03~EpzVroFXi2172521725eucas1p2O; Wed, 25 Jul 2018 15:47:01 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id F9.40.05751.47B985B5; Wed, 25 Jul 2018 16:47:00 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180725154700eucas1p1ae0db40d64d3ccdd59ef992c9e02aa4b~EpzU8lm5M1246612466eucas1p1x; Wed, 25 Jul 2018 15:47:00 +0000 (GMT) X-AuditID: cbfec7f4-c2dff70000001677-a6-5b589b742ebf Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 63.03.04178.47B985B5; Wed, 25 Jul 2018 16:47:00 +0100 (BST) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PCF00M07IIAVC60@eusync4.samsung.com>; Wed, 25 Jul 2018 16:47:00 +0100 (BST) From: Andrzej Hajda To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, Inki Dae Cc: Maciej Purski , Bartlomiej Zolnierkiewicz , Marek Szyprowski , Andrzej Hajda , Rob Herring , Thierry Reding , Krzysztof Kozlowski , Archit Taneja , Laurent Pinchart Subject: [PATCH v5 3/9] drm/exynos: enable out_bridge in exynos_dsi_enable Date: Wed, 25 Jul 2018 17:46:38 +0200 Message-id: <20180725154644.25412-4-a.hajda@samsung.com> X-Mailer: git-send-email 2.18.0 In-reply-to: <20180725154644.25412-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrDIsWRmVeSWpSXmKPExsWy7djP87olsyOiDTYdNba4te4cq0VTx1tW i40z1rNaXPn6ns1i0v0JLBbnz29gt+icuITdYsb5fUwWC17eYrFYe+Quu0Xr3iPsFj93zWNx 4PG43NfL5LFz1l12j9kdM1k9Nq3qZPO4332cyaNvyypGj8+b5ALYo7hsUlJzMstSi/TtErgy 1px6w1pwT7hi2sIPLA2MpwW6GDk5JARMJN4sn8EOYgsJrGCUOP2FpYuRC8j+zCgx9/JjJpii Tdc+QCWWMUp0//zKDuH8Z5Q493ItWBWbgKbE38032UBsEYFMiQ0HF4IVMQv0MEucO30HrEhY wEti78VLYDaLgKrEtXknwXbzClhIbJj5jxVinbzEw+PtjCA2p4ClxJX9h9hABkkI7GGTuPP+ ExtEkYvE58WfmSFsYYlXx7ewQ9gyEp0dB6HurpdomnmFGaK5g1HixOLlUM3WEoePXwTbxizA JzFp23SgIg6gOK9ER5sQhOkhsXmFL8SXPYwSa3e1M05glFzAyLCKUTy1tDg3PbXYKC+1XK84 Mbe4NC9dLzk/dxMjMI5P/zv+ZQfjrj9JhxgFOBiVeHg/2oVHC7EmlhVX5h5ilOBgVhLhdTkM FOJNSaysSi3Kjy8qzUktPsQozcGiJM4r7RMRLSSQnliSmp2aWpBaBJNl4uCUamBk/q272o/R UYLnj8QrU7VSe4vdaezPOwROxee5LE+qVvv7T2LTb5GzXvumWuXvX77/pEiqlJpIi7p8UG7S lPh/M2MXqXW8iXqm1NS6cvX1Wc/nG+j5TbM3MFH4Kv5W6JT40Wk3C4PyXiocqHf/tdwyltVH Vu0Mw3q7PXdaFhfNEgqfcLll8j4lluKMREMt5qLiRABsYPUy3wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNLMWRmVeSWpSXmKPExsVy+t/xa7olsyOiDbY9EbC4te4cq0VTx1tW i40z1rNaXPn6ns1i0v0JLBbnz29gt+icuITdYsb5fUwWC17eYrFYe+Quu0Xr3iPsFj93zWNx 4PG43NfL5LFz1l12j9kdM1k9Nq3qZPO4332cyaNvyypGj8+b5ALYo7hsUlJzMstSi/TtErgy 1px6w1pwT7hi2sIPLA2MpwW6GDk5JARMJDZd+8DSxcjFISSwhFGi7dpBJginkUni6PpvzCBV bAKaEn8332QDsUUEMiUurW1lBiliFuhjltj7bSUTSEJYwEti78VLYDaLgKrEtXkn2UFsXgEL iQ0z/7FCrJOXeHi8nRHE5hSwlLiy/xDYUCGgmgMb17FNYORZwMiwilEktbQ4Nz232FCvODG3 uDQvXS85P3cTIzAItx37uXkH46WNwYcYBTgYlXh4L8yMiBZiTSwrrsw9xCjBwawkwutyODxa iDclsbIqtSg/vqg0J7X4EKM0B4uSOO95g8ooIYH0xJLU7NTUgtQimCwTB6dUA6NH3yPZ8PY7 mx7dqfs0oXxiykVL5UV8z/xs7OW2Pr4ttF1w/q9UveZZjMGHll9Ytrh8R6Z0u8YHCY072VVC 7VzOFgInD1qWa+y49P77nMXL+3uyz08r3LBTbmr8xWUzJTYkx7GK87DrHZoi6fzn4WEhrqP9 kZq1tzTYn52q38y/SGuXjZJVxX0lluKMREMt5qLiRAAk6KltPgIAAA== X-CMS-MailID: 20180725154700eucas1p1ae0db40d64d3ccdd59ef992c9e02aa4b X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180725154700eucas1p1ae0db40d64d3ccdd59ef992c9e02aa4b References: <20180725154644.25412-1-a.hajda@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Maciej Purski As the out bridge will not be enabled directly by the framework, it should be enabled by DSI. exynos_dsi_enable() should handle a case, when there is an out_bridge connected as a DSI peripheral. Changed in v5: - fixed error path in exynos_dsi_enable Signed-off-by: Maciej Purski [ a.hajda@samsung.com: v5 ] Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 38 +++++++++++++++---------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index f5f51f584fa0..54cfcebe7a2c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -1383,29 +1383,37 @@ static void exynos_dsi_enable(struct drm_encoder *encoder) return; pm_runtime_get_sync(dsi->dev); - dsi->state |= DSIM_STATE_ENABLED; - ret = drm_panel_prepare(dsi->panel); - if (ret < 0) { - dsi->state &= ~DSIM_STATE_ENABLED; - pm_runtime_put_sync(dsi->dev); - return; + if (dsi->panel) { + ret = drm_panel_prepare(dsi->panel); + if (ret < 0) + goto err_put_sync; + } else { + drm_bridge_pre_enable(dsi->out_bridge); } exynos_dsi_set_display_mode(dsi); exynos_dsi_set_display_enable(dsi, true); - ret = drm_panel_enable(dsi->panel); - if (ret < 0) { - dsi->state &= ~DSIM_STATE_ENABLED; - exynos_dsi_set_display_enable(dsi, false); - drm_panel_unprepare(dsi->panel); - pm_runtime_put_sync(dsi->dev); - return; + if (dsi->panel) { + ret = drm_panel_enable(dsi->panel); + if (ret < 0) + goto err_display_disable; + } else { + drm_bridge_enable(dsi->out_bridge); } dsi->state |= DSIM_STATE_VIDOUT_AVAILABLE; + return; + +err_display_disable: + exynos_dsi_set_display_enable(dsi, false); + drm_panel_unprepare(dsi->panel); + +err_put_sync: + dsi->state &= ~DSIM_STATE_ENABLED; + pm_runtime_put(dsi->dev); } static void exynos_dsi_disable(struct drm_encoder *encoder) @@ -1418,11 +1426,11 @@ static void exynos_dsi_disable(struct drm_encoder *encoder) dsi->state &= ~DSIM_STATE_VIDOUT_AVAILABLE; drm_panel_disable(dsi->panel); + drm_bridge_disable(dsi->out_bridge); exynos_dsi_set_display_enable(dsi, false); drm_panel_unprepare(dsi->panel); - + drm_bridge_post_disable(dsi->out_bridge); dsi->state &= ~DSIM_STATE_ENABLED; - pm_runtime_put_sync(dsi->dev); }