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.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 57A9FC10F0B for ; Thu, 18 Apr 2019 07:51:32 +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 267DE2183E for ; Thu, 18 Apr 2019 07:51:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iOTcKU+L"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="UMpAUoP+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 267DE2183E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org 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:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ovDqBnIaLrhekTeEmG81E3x8E9o3LRjBH5SkoONCZMo=; b=iOTcKU+Lg+l0dQ wEuU17+fP5gDLxu7wubUWyeDRVwSzfouqvgSFTswXA3g76o4zHHOxxQcobxPX7lXF3srltVV/+Avw zr0c6HUsuGqqWxxbNUyw0EcerFHFy+y+V7KzroLIURwFcOGN+25/B8gbAUClTi2UdnVD6l6hf9xBt EcPv23GPMYjqKD9yZlu6I52SanSg0AoFRUtZOSUidPfZvg+bCP3b0eHRnP0Eb//1aI2VvADWLhHlb SOx5DGniaCfcx8gHtWAuQqq9HaltufaK1FkGXC5FjLTfhuj6Wh8lO0j6D1x3Pj7eo8UdmN3ZMbbR5 7HKMcZ1OwepI3o7R2bCA==; 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 1hH1pJ-0003A0-VD; Thu, 18 Apr 2019 07:51:21 +0000 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH1pG-00038t-HX for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2019 07:51:20 +0000 Received: by mail-qt1-x842.google.com with SMTP id w5so1182542qtb.11 for ; Thu, 18 Apr 2019 00:51:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QO1iSRDlcNOl22A4/YfeKOusfnOAy/j21lUNnn3Rjhw=; b=UMpAUoP+8BmHlrChsvm22sad51bHm0B0HHD37cvDQbB5764YayjmU0lycXYtiAgins iQsx+DlLMyab4AQKCh/Sp2dtDUzIa2t7qsoxj3YDRqBVhsoHAZNCWk5C2VvcquDfeqZ8 YhrPbQNXlsJN9ePOey8SHHsejkUw0JQJsw9Pc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QO1iSRDlcNOl22A4/YfeKOusfnOAy/j21lUNnn3Rjhw=; b=F4rnk5U1lXqOFSwcMk/HxKrFdJYcD5EF2zje8OTTwApA0yfEseatbbkCwiqFMijJjF V/SyYZFttCHXsb6AM3dRlfK7Xz3IGV1pyQZe9HGPQPSrU20oh2DTz0A8BmlE5cmCVwsp YRrPCtRqXrTpkf+/4FxYVA2XiNl2cmU71MtxMtBv2qeFGgwdjMSopoyg0dH6uf76YVyy d222pmgZUrdFM2S55MLTzYgOe2Th2EdAAgLgOIW7Gg41sj6YoYuJ4pTZrKExZ8jH8S18 GxQP2NaBsSXyCeWMdURSAn3Nk5KeYrNqyI5EFo5LtKw+JnXKVjndeH9YhAsvyUFoifyv htXQ== X-Gm-Message-State: APjAAAUosle6QERXgSeuQlJZKbQ437nNwYXb9+FKZvNUMjF8l4kg+sls TNQ7SffWqFn7lgtR1tvNT/SbRYHZyRFe2llAvfUdwg== X-Google-Smtp-Source: APXvYqyACxlPXnKiJcy9QU+c7HF0WEm34lLj/4GbymVqieRN50kH4onSs4AkHyNHzdlSu1oO8cnQo/3PTFKRxgKmEpA= X-Received: by 2002:ac8:f3c:: with SMTP id e57mr70948443qtk.75.1555573875417; Thu, 18 Apr 2019 00:51:15 -0700 (PDT) MIME-Version: 1.0 References: <20190416060501.76276-1-jitao.shi@mediatek.com> <20190416060501.76276-3-jitao.shi@mediatek.com> In-Reply-To: <20190416060501.76276-3-jitao.shi@mediatek.com> From: Nicolas Boichat Date: Thu, 18 Apr 2019 15:51:03 +0800 Message-ID: Subject: Re: [v2 2/5] drm/mediatek: CMDQ reg address of mt8173 is different with mt2701 To: Jitao Shi X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190418_005118_585842_E5BA7C9C X-CRM114-Status: GOOD ( 20.52 ) 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, Ajay Kumar , Vincent Palatin , cawa cheng , Russell King , Thierry Reding , Sean Paul , linux-pwm@vger.kernel.org, Pawel Moll , Ian Campbell , Rob Herring , "moderated list:ARM/Mediatek SoC support" , Yingjoe Chen , Matthias Brugger , Eddie Huang , linux-arm Mailing List , Rahul Sharma , srv_heupstream , lkml , Sascha Hauer , Kumar Gala , Andy Yan 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 On Tue, Apr 16, 2019 at 2:05 PM Jitao Shi wrote: > > Config the different CMDQ reg address in driver data. > > Signed-off-by: Jitao Shi > --- > drivers/gpu/drm/mediatek/mtk_dsi.c | 39 +++++++++++++++++++++++------- > 1 file changed, 30 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c > index 6c4ac37f983d..573e6bec6d36 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; > + struct mtk_dsi_driver_data *driver_data; As highlighted by kbuild, you're missing a const here. > }; > > 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)); The writeb call looked significantly cleaner... writeb(tx_buf[i], dsi->regs + reg_cmdq_off + cmdq_off + i); should just work, right? > > - 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); > } > > @@ -1074,10 +1081,27 @@ static const struct component_ops mtk_dsi_component_ops = { > .unbind = mtk_dsi_unbind, > }; > > +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", > + .data = &mt2701_dsi_driver_data }, > + { .compatible = "mediatek,mt8173-dsi", > + .data = &mt8173_dsi_driver_data }, > + { }, > +}; > + > static int mtk_dsi_probe(struct platform_device *pdev) > { > struct mtk_dsi *dsi; > struct device *dev = &pdev->dev; > + const struct of_device_id *of_id; > struct resource *regs; > int irq_num; > int comp_id; > @@ -1101,6 +1125,9 @@ static int mtk_dsi_probe(struct platform_device *pdev) > if (ret) > goto err_unregister_host; > > + of_id = of_match_device(mtk_dsi_of_match, &pdev->dev); > + dsi->driver_data = of_id->data; > + > dsi->engine_clk = devm_clk_get(dev, "engine"); > if (IS_ERR(dsi->engine_clk)) { > ret = PTR_ERR(dsi->engine_clk); > @@ -1193,12 +1220,6 @@ static int mtk_dsi_remove(struct platform_device *pdev) > return 0; > } > > -static const struct of_device_id mtk_dsi_of_match[] = { > - { .compatible = "mediatek,mt2701-dsi" }, > - { .compatible = "mediatek,mt8173-dsi" }, > - { }, > -}; > - > struct platform_driver mtk_dsi_driver = { > .probe = mtk_dsi_probe, > .remove = mtk_dsi_remove, > -- > 2.21.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel