From patchwork Fri Feb 24 12:54:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Keeping X-Patchwork-Id: 9590159 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 C4B48601AE for ; Fri, 24 Feb 2017 13:03:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88A2B28753 for ; Fri, 24 Feb 2017 13:03:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D8AF2875B; Fri, 24 Feb 2017 13:03:16 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham 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 32A7728753 for ; Fri, 24 Feb 2017 13:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ODfQBjPMKfum18+1/JDRaJklnqSyGavMTUpyzjQ7Dxk=; b=XjqTchvy/LdnE66/dnPdv/2ERA rm67DwmT9JN0bIL4GAFI0QzqLsDvO+sRriUWRYpIBhfzbpG6M2/I31RXNxX2porPdN8Rk4xagOTal P5RBFbNb0UOCRUyRAFB4KFKCj6KHsJ9UHP38d/u9gg4jEw7zmRLevtRW4obZeKfKsvQEaBIP3O/pr IuIf7++mrR6JvSdt5YuAbvSBPWpaUssPM7qrfZIbhRqmBEJDkx+V2z8raYHK1SAx/WE3qWhno1vq/ /GGl2MyhqcmcTRba2A8VixrjXWCf+dyfRSoi3usyBJrOWANHkA4m+PboJkfwMXSJkmAXQawmcc3Ir vsfBGPJg==; 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 1chFWl-0003o7-BN; Fri, 24 Feb 2017 13:03:15 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1chFPi-0006Xx-3a; Fri, 24 Feb 2017 12:55:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ujl6Wd1hGRJLcEYgvAOGmAGNomcG3vh0ZCIl//l5tFk=; b=rWJcyrpno42FtFEeouRsYEvp8 ic1vfh7CeUlbN3aW83QT8VbAm2Ba8QzP74kEf8p6+DqZJTLr2gEMiaPIItioDjiSAfVxy1DOWWQOc 8brIVfVcKVh8RzR8tlwn5yX+n2gE7eQve5h1+bo/KyCROTF/sTZ/sutel+5sOGLoOvpTpTF3341DJ /l/ZIR14sGsc68I7+DEV5btCC3n/NY5XqvhfnMccMNS7L03h5g+I2TXc2fcFuMvHpmGuu5CEH1OAx 4wVMKS3tkbJDuXMfkgd/SDawiZRFTU/bXf+TchOdMUqEDz85jhJzmaMOTTKiqf+MffFL4ibnxehJQ MnwrPO/Zw==; Received: from dougal.metanate.com ([90.155.101.14] helo=metanate.com) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1chFPd-00039N-JU; Fri, 24 Feb 2017 12:55:57 +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=EvViE3uPBI2mJ71s6nwJrOc9dyEjCBhRfWRClJZCKwo=; b=TxHR1t3RlILS8GEtuHuIs9mYhBG7ar+ILemM1oH/DzRH3tHmiMOKnCc4IWsV3yLSsDJtFjQKAc1ExMa83e1Zr5Kik5NK3tHVniWDtlBGlPD8a3w0YQwXpXQiPTfWsMp6XLutJ2fWT/z4k26eiOkpAnDUiExRF+ngOt7NioclgS1BaOwvotBAsVHMzqBn5R1gZ5Wzq4ZPvw0oJ5cat/eDXiBZsFGNxvh6RHucySnCkKce+Yzyiod866nTxqDDorFUUF4rHIDbSVW3PixuZbPJwzc6L/8whKROF8ec5s/C+wtUvkch3jgvq3bG7ggxHbl7DPuB1fWr5Jtn0fsDjbP2Hw==; Received: from brian ([192.168.88.1] helo=leela.metanate.com) by shrek.metanate.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-GCM-SHA256:128) (Exim 4.83_RC2) (envelope-from ) id 1chFP0-0006ml-S3; Fri, 24 Feb 2017 12:55:14 +0000 From: John Keeping To: Mark Yao Subject: [PATCH v4 11/23] drm/rockchip: dw-mipi-dsi: prepare panel after phy init Date: Fri, 24 Feb 2017 12:54:54 +0000 Message-Id: <20170224125506.21533-12-john@metanate.com> X-Mailer: git-send-email 2.12.0.rc0.230.gf625d4cdb9.dirty In-Reply-To: <20170224125506.21533-1-john@metanate.com> References: <20170224125506.21533-1-john@metanate.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170224_075553_801466_F76F1473 X-CRM114-Status: UNSURE ( 6.50 ) 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, Sean Paul , Chris Zhong , John Keeping , 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 Some panels need to be configured with commands sent over the MIPI link, which they will do in the prepare hook. Call this after the PHY has been initialized so that we are able to send commands to the panel. Signed-off-by: John Keeping Reviewed-by: Chris Zhong Reviewed-by: Sean Paul --- v4: - Add Sean's Reviewed-by v3: - Add Chris' Reviewed-by Unchanged in v2 --- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index 0c66e6eaf44a..53515404d0ca 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -898,12 +898,14 @@ static void dw_mipi_dsi_encoder_enable(struct drm_encoder *encoder) dw_mipi_dsi_dphy_timing_config(dsi); dw_mipi_dsi_dphy_interface_config(dsi); dw_mipi_dsi_clear_err(dsi); - if (drm_panel_prepare(dsi->panel)) - dev_err(dsi->dev, "failed to prepare panel\n"); dw_mipi_dsi_phy_init(dsi); dw_mipi_dsi_wait_for_two_frames(mode); + dw_mipi_dsi_set_mode(dsi, DW_MIPI_DSI_CMD_MODE); + if (drm_panel_prepare(dsi->panel)) + dev_err(dsi->dev, "failed to prepare panel\n"); + dw_mipi_dsi_set_mode(dsi, DW_MIPI_DSI_VID_MODE); drm_panel_enable(dsi->panel);