From patchwork Sun Jan 29 13:24:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Keeping X-Patchwork-Id: 9544009 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7EFDA60415 for ; Sun, 29 Jan 2017 13:26:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70B2A23E64 for ; Sun, 29 Jan 2017 13:26:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 643702621F; Sun, 29 Jan 2017 13:26:48 +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=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0CEB823E64 for ; Sun, 29 Jan 2017 13:26:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cXpVH-0004bL-Gq; Sun, 29 Jan 2017 13:26:47 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cXpUG-0003wA-Mv; Sun, 29 Jan 2017 13:25:44 +0000 Received: from dougal.metanate.com ([90.155.101.14] helo=metanate.com) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cXpUB-00055Y-Vs; Sun, 29 Jan 2017 13:25:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=metanate.com; s=stronger; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=non5TDmtN74yysXlM/dQJWvXswBwWmDBsRQDnjWGKCM=; b=QwuMme633tFh6wckc9Uox9veqUMRh3v2HWMvLdPXs63pFzRKshj4musgegMsptAmlYbmlTUtux9A1735pwqdiwtkpBEUpQOQJyu3o9zaESn1nFj1i9zZqQ0ylYt0JbZWffRH9cC2MqO9A+zCkInTxhF6hd03VS1W2Wl6YGwJKb+Yrg50e7ssyjiwrWV8qelyRsPOLnWdA4QUBeCZCnp+FpXqktzGneqZt8t2blR8b81/hKwb9R5cJvZh0V9GzhnRGBDiKxRNt/lEmLDOs2cYlBpdtNL0qSpytVCCoXqGYNm38oO/58L+gpnxbdmPVLZQRuDZtOZiRuA7MmNLZdwMFg==; Received: from johnkeeping.plus.com ([81.174.171.191] helo=localhost.localdomain) by shrek.metanate.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-GCM-SHA256:128) (Exim 4.83_RC2) (envelope-from ) id 1cXpTn-000362-N2; Sun, 29 Jan 2017 13:25:15 +0000 From: John Keeping To: Mark Yao Subject: [PATCH v3 21/24] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded Date: Sun, 29 Jan 2017 13:24:41 +0000 Message-Id: <20170129132444.25251-22-john@metanate.com> X-Mailer: git-send-email 2.11.0.197.gb556de5.dirty In-Reply-To: <20170129132444.25251-1-john@metanate.com> References: <20170129132444.25251-1-john@metanate.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170129_132540_134677_41D944C2 X-CRM114-Status: UNSURE ( 9.22 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, John Keeping , Chris Zhong , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This ensures that the output resolution is known before fbcon loads. Signed-off-by: John Keeping --- Unchanged in v3 Unchanged in v2 drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index f5b15377ef85..5bad92e2370e 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -1176,10 +1176,17 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, dsi->dsi_host.ops = &dw_mipi_dsi_host_ops; dsi->dsi_host.dev = dev; - return mipi_dsi_host_register(&dsi->dsi_host); + ret = mipi_dsi_host_register(&dsi->dsi_host); + if (!ret && !dsi->panel) { + mipi_dsi_host_unregister(&dsi->dsi_host); + drm_encoder_cleanup(&dsi->encoder); + drm_connector_cleanup(&dsi->connector); + ret = -EPROBE_DEFER; + } err_pllref: - clk_disable_unprepare(dsi->pllref_clk); + if (ret) + clk_disable_unprepare(dsi->pllref_clk); return ret; }