From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,UNPARSEABLE_RELAY, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BB7DC28CC5 for ; Mon, 3 Jun 2019 02:13:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E46B827AC3 for ; Mon, 3 Jun 2019 02:13:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mc1Nlc06" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E46B827AC3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XSajLpQSYRKdEhGK2RCEYp2CsgEvFZEBKp1qFUt2RuI=; b=mc1Nlc069OyrgP LPY9RkpqKOB0L4VfIdJyh00qP3mrajlU/SaZhv3IelDGKn9hUtxztwhqaFJE+BToDgJfYsxED0ZNi lqoVX+aElhv2Af6pqyZhmcbwZ4XU3IdEJqGjOrKA3edFNzhNjFjfArDnScPuYQG7E5MX9CY34Pf7X AJFraVTPhRrKWS7ETcPodSKzJxa3tZ/hRpsR1f9xI8bpVEMk4luvDEdda7gbLQPyA84Un6DP2d8Xl VwuEzGq2M+Zs+eY86EtGaB0bPY/dd619bGRn3oUqnfdHq/nxwEhzF34nJ2vSk1lDhnK8q5NBIP8mB T91kzKHJvMUAkPcq7SzQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXcTx-0001mD-CK; Mon, 03 Jun 2019 02:13:53 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXcTr-0001kw-Tt; Mon, 03 Jun 2019 02:13:50 +0000 X-UUID: 082f5bd204e6470b81dc03610650c687-20190602 X-UUID: 082f5bd204e6470b81dc03610650c687-20190602 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1306607882; Sun, 02 Jun 2019 18:13:41 -0800 Received: from MTKMBS33DR.mediatek.inc (172.27.6.106) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Sun, 2 Jun 2019 19:13:38 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by MTKMBS33DR.mediatek.inc (172.27.6.106) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 3 Jun 2019 10:13:30 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 3 Jun 2019 10:13:29 +0800 Message-ID: <1559528009.32185.3.camel@mtksdaap41> Subject: Re: [v4 2/7] drm/mediatek: fixes CMDQ reg address of mt8173 is different with mt2701 From: CK Hu To: Jitao Shi Date: Mon, 3 Jun 2019 10:13:29 +0800 In-Reply-To: <20190601092615.67917-3-jitao.shi@mediatek.com> References: <20190601092615.67917-1-jitao.shi@mediatek.com> <20190601092615.67917-3-jitao.shi@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190602_191347_998575_5F4C0F3E X-CRM114-Status: GOOD ( 16.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, David Airlie , stonea168@163.com, dri-devel@lists.freedesktop.org, yingjoe.chen@mediatek.com, Ajay Kumar , Vincent Palatin , cawa.cheng@mediatek.com, bibby.hsieh@mediatek.com, Russell King , Thierry Reding , linux-pwm@vger.kernel.org, Sascha Hauer , Pawel Moll , Ian Campbell , Inki Dae , Rob Herring , linux-mediatek@lists.infradead.org, Andy Yan , Matthias Brugger , eddie.huang@mediatek.com, linux-arm-kernel@lists.infradead.org, Rahul Sharma , srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org, Philipp Zabel , Sean Paul Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, Jitao: On Sat, 2019-06-01 at 17:26 +0800, Jitao Shi wrote: > Config the different CMDQ reg address in driver data. > > Signed-off-by: Jitao Shi > --- > drivers/gpu/drm/mediatek/mtk_dsi.c | 29 ++++++++++++++++++++++++----- > 1 file changed, 24 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c > index 6c4ac37f983d..a48db056df6c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dsi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c > @@ -131,7 +131,6 @@ > #define VM_CMD_EN BIT(0) > #define TS_VFP_EN BIT(5) > > -#define DSI_CMDQ0 0x180 > #define CONFIG (0xff << 0) > #define SHORT_PACKET 0 > #define LONG_PACKET 2 > @@ -156,6 +155,10 @@ > > struct phy; > > +struct mtk_dsi_driver_data { > + const u32 reg_cmdq_off; > +}; > + > struct mtk_dsi { > struct mtk_ddp_comp ddp_comp; > struct device *dev; > @@ -182,6 +185,7 @@ struct mtk_dsi { > bool enabled; > u32 irq_data; > wait_queue_head_t irq_wait_queue; > + const struct mtk_dsi_driver_data *driver_data; > }; > > static inline struct mtk_dsi *encoder_to_dsi(struct drm_encoder *e) > @@ -934,6 +938,7 @@ static void mtk_dsi_cmdq(struct mtk_dsi *dsi, const struct mipi_dsi_msg *msg) > const char *tx_buf = msg->tx_buf; > u8 config, cmdq_size, cmdq_off, type = msg->type; > u32 reg_val, cmdq_mask, i; > + u32 reg_cmdq_off = dsi->driver_data->reg_cmdq_off; > > if (MTK_DSI_HOST_IS_READ(type)) > config = BTA; > @@ -953,9 +958,11 @@ static void mtk_dsi_cmdq(struct mtk_dsi *dsi, const struct mipi_dsi_msg *msg) > } > > for (i = 0; i < msg->tx_len; i++) > - writeb(tx_buf[i], dsi->regs + DSI_CMDQ0 + cmdq_off + i); > + mtk_dsi_mask(dsi, (reg_cmdq_off + cmdq_off + i) & (~0x3U), > + (0xffUL << (((i + cmdq_off) & 3U) * 8U)), > + tx_buf[i] << (((i + cmdq_off) & 3U) * 8U)); I've modify this line to writeb(tx_buf[i], dsi->regs + reg_cmdq_off + cmdq_off + i); and this works. The call trace list below [ 8.189067] Call trace: [ 8.191516] dump_backtrace+0x0/0x164 [ 8.195172] show_stack+0x20/0x2c [ 8.198482] dump_stack+0xc4/0xfc [ 8.201792] mtk_dsi_host_transfer+0x248/0x4ac [ 8.206230] mipi_dsi_device_transfer+0x50/0x64 [ 8.210753] mipi_dsi_dcs_exit_sleep_mode+0x5c/0x8c [ 8.215625] innolux_panel_prepare+0x128/0x218 [ 8.220061] mtk_dsi_poweron+0x74c/0x7c8 [ 8.223976] mtk_dsi_ddp_start+0x1c/0x28 [ 8.227891] mtk_drm_crtc_atomic_enable+0x310/0x428 [ 8.232765] drm_atomic_helper_commit_modeset_enables+0xa0/0x200 [ 8.238764] mtk_atomic_complete+0x84/0xd0 [ 8.242852] mtk_atomic_commit+0xb8/0xe0 [ 8.246769] drm_atomic_commit+0x50/0x5c [ 8.250684] drm_atomic_helper_set_config+0x98/0xa0 [ 8.255555] drm_mode_setcrtc+0x280/0x618 [ 8.259558] drm_ioctl_kernel+0xcc/0x10c [ 8.263473] drm_ioctl+0x248/0x3d4 [ 8.266868] drm_compat_ioctl+0xd8/0xe8 [ 8.270698] __arm64_compat_sys_ioctl+0xf4/0x25c [ 8.275309] el0_svc_common+0x9c/0xfc [ 8.278965] el0_svc_compat_handler+0x2c/0x38 [ 8.283314] el0_svc_compat+0x8/0x18 So I think writeb() could work correctly. If you have meet some problem, it might be other problem. Regards, CK > > - mtk_dsi_mask(dsi, DSI_CMDQ0, cmdq_mask, reg_val); > + mtk_dsi_mask(dsi, reg_cmdq_off, cmdq_mask, reg_val); > mtk_dsi_mask(dsi, DSI_CMDQ_SIZE, CMDQ_SIZE, cmdq_size); > } > > @@ -1101,6 +1108,8 @@ static int mtk_dsi_probe(struct platform_device *pdev) > if (ret) > goto err_unregister_host; > > + dsi->driver_data = of_device_get_match_data(dev); > + > dsi->engine_clk = devm_clk_get(dev, "engine"); > if (IS_ERR(dsi->engine_clk)) { > ret = PTR_ERR(dsi->engine_clk); > @@ -1193,9 +1202,19 @@ static int mtk_dsi_remove(struct platform_device *pdev) > return 0; > } > > +static const struct mtk_dsi_driver_data mt8173_dsi_driver_data = { > + .reg_cmdq_off = 0x200, > +}; > + > +static const struct mtk_dsi_driver_data mt2701_dsi_driver_data = { > + .reg_cmdq_off = 0x180, > +}; > + > static const struct of_device_id mtk_dsi_of_match[] = { > - { .compatible = "mediatek,mt2701-dsi" }, > - { .compatible = "mediatek,mt8173-dsi" }, > + { .compatible = "mediatek,mt2701-dsi", > + .data = &mt2701_dsi_driver_data }, > + { .compatible = "mediatek,mt8173-dsi", > + .data = &mt8173_dsi_driver_data }, > { }, > }; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel