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=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=ham 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 EB6EEC004C9 for ; Wed, 8 May 2019 02:39:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BAF1B21479 for ; Wed, 8 May 2019 02:39:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726522AbfEHCjO (ORCPT ); Tue, 7 May 2019 22:39:14 -0400 Received: from Mailgw01.mediatek.com ([1.203.163.78]:14670 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726371AbfEHCjN (ORCPT ); Tue, 7 May 2019 22:39:13 -0400 X-UUID: 5c2410f0ce734c189fe4165f79ed32a3-20190508 X-UUID: 5c2410f0ce734c189fe4165f79ed32a3-20190508 Received: from mtkcas36.mediatek.inc [(172.27.4.253)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 1437165598; Wed, 08 May 2019 10:39:08 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS33DR.mediatek.inc (172.27.6.106) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 8 May 2019 10:39:05 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 8 May 2019 10:39:05 +0800 Message-ID: <1557283144.31731.4.camel@mtksdaap41> Subject: Re: [v2 2/5] drm/mediatek: CMDQ reg address of mt8173 is different with mt2701 From: CK Hu To: Jitao Shi CC: Rob Herring , Pawel Moll , "Mark Rutland" , Ian Campbell , Kumar Gala , , David Airlie , "Matthias Brugger" , Thierry Reding , "Ajay Kumar" , Inki Dae , "Rahul Sharma" , Sean Paul , Vincent Palatin , Andy Yan , Philipp Zabel , "Russell King" , , , , , , , Sascha Hauer , , , , , Date: Wed, 8 May 2019 10:39:04 +0800 In-Reply-To: <20190416060501.76276-3-jitao.shi@mediatek.com> References: <20190416060501.76276-1-jitao.shi@mediatek.com> <20190416060501.76276-3-jitao.shi@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2019-04-16 at 14:04 +0800, Jitao Shi wrote: > Config the different CMDQ reg address in driver data. > For MT8173, you change reg_cmd_off from 0x180 to 0x200, so this patch is a bug fix. You should add a 'Fixes' tag. > 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; > }; > > 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)); You say you would follow Nicolas' suggestion here. > > - 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; Maybe use of_device_get_match_data() is a more simple way. You could refer to [1]. [1] https://elixir.bootlin.com/linux/v5.1/source/drivers/gpu/drm/mediatek/mtk_disp_ovl.c#L300 Regards, CK > + > 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, From mboxrd@z Thu Jan 1 00:00:00 1970 From: CK Hu Subject: Re: [v2 2/5] drm/mediatek: CMDQ reg address of mt8173 is different with mt2701 Date: Wed, 8 May 2019 10:39:04 +0800 Message-ID: <1557283144.31731.4.camel@mtksdaap41> References: <20190416060501.76276-1-jitao.shi@mediatek.com> <20190416060501.76276-3-jitao.shi@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190416060501.76276-3-jitao.shi@mediatek.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Jitao Shi 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, Russell King , Thierry Reding , linux-pwm@vger.kernel.org, Sascha Hauer , Pawel Moll , Ian Campbell , 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, Kumar Gala , Sean Paul List-Id: devicetree@vger.kernel.org T24gVHVlLCAyMDE5LTA0LTE2IGF0IDE0OjA0ICswODAwLCBKaXRhbyBTaGkgd3JvdGU6Cj4gQ29u ZmlnIHRoZSBkaWZmZXJlbnQgQ01EUSByZWcgYWRkcmVzcyBpbiBkcml2ZXIgZGF0YS4KPiAKRm9y IE1UODE3MywgeW91IGNoYW5nZSByZWdfY21kX29mZiBmcm9tIDB4MTgwIHRvIDB4MjAwLCBzbyB0 aGlzIHBhdGNoIGlzCmEgYnVnIGZpeC4gWW91IHNob3VsZCBhZGQgYSAnRml4ZXMnIHRhZy4KCj4g U2lnbmVkLW9mZi1ieTogSml0YW8gU2hpIDxqaXRhby5zaGlAbWVkaWF0ZWsuY29tPgo+IC0tLQo+ ICBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RzaS5jIHwgMzkgKysrKysrKysrKysrKysr KysrKysrKystLS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspLCA5IGRl bGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRr X2RzaS5jIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kc2kuYwo+IGluZGV4IDZjNGFj MzdmOTgzZC4uNTczZTZiZWM2ZDM2IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRp YXRlay9tdGtfZHNpLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RzaS5j Cj4gQEAgLTEzMSw3ICsxMzEsNiBAQAo+ICAjZGVmaW5lIFZNX0NNRF9FTgkJCUJJVCgwKQo+ICAj ZGVmaW5lIFRTX1ZGUF9FTgkJCUJJVCg1KQo+ICAKPiAtI2RlZmluZSBEU0lfQ01EUTAJCTB4MTgw Cj4gICNkZWZpbmUgQ09ORklHCQkJCSgweGZmIDw8IDApCj4gICNkZWZpbmUgU0hPUlRfUEFDS0VU CQkJMAo+ICAjZGVmaW5lIExPTkdfUEFDS0VUCQkJMgo+IEBAIC0xNTYsNiArMTU1LDEwIEBACj4g IAo+ICBzdHJ1Y3QgcGh5Owo+ICAKPiArc3RydWN0IG10a19kc2lfZHJpdmVyX2RhdGEgewo+ICsJ Y29uc3QgdTMyIHJlZ19jbWRxX29mZjsKPiArfTsKPiArCj4gIHN0cnVjdCBtdGtfZHNpIHsKPiAg CXN0cnVjdCBtdGtfZGRwX2NvbXAgZGRwX2NvbXA7Cj4gIAlzdHJ1Y3QgZGV2aWNlICpkZXY7Cj4g QEAgLTE4Miw2ICsxODUsNyBAQCBzdHJ1Y3QgbXRrX2RzaSB7Cj4gIAlib29sIGVuYWJsZWQ7Cj4g IAl1MzIgaXJxX2RhdGE7Cj4gIAl3YWl0X3F1ZXVlX2hlYWRfdCBpcnFfd2FpdF9xdWV1ZTsKPiAr CXN0cnVjdCBtdGtfZHNpX2RyaXZlcl9kYXRhICpkcml2ZXJfZGF0YTsKPiAgfTsKPiAgCj4gIHN0 YXRpYyBpbmxpbmUgc3RydWN0IG10a19kc2kgKmVuY29kZXJfdG9fZHNpKHN0cnVjdCBkcm1fZW5j b2RlciAqZSkKPiBAQCAtOTM0LDYgKzkzOCw3IEBAIHN0YXRpYyB2b2lkIG10a19kc2lfY21kcShz dHJ1Y3QgbXRrX2RzaSAqZHNpLCBjb25zdCBzdHJ1Y3QgbWlwaV9kc2lfbXNnICptc2cpCj4gIAlj b25zdCBjaGFyICp0eF9idWYgPSBtc2ctPnR4X2J1ZjsKPiAgCXU4IGNvbmZpZywgY21kcV9zaXpl LCBjbWRxX29mZiwgdHlwZSA9IG1zZy0+dHlwZTsKPiAgCXUzMiByZWdfdmFsLCBjbWRxX21hc2ss IGk7Cj4gKwl1MzIgcmVnX2NtZHFfb2ZmID0gZHNpLT5kcml2ZXJfZGF0YS0+cmVnX2NtZHFfb2Zm Owo+ICAKPiAgCWlmIChNVEtfRFNJX0hPU1RfSVNfUkVBRCh0eXBlKSkKPiAgCQljb25maWcgPSBC VEE7Cj4gQEAgLTk1Myw5ICs5NTgsMTEgQEAgc3RhdGljIHZvaWQgbXRrX2RzaV9jbWRxKHN0cnVj dCBtdGtfZHNpICpkc2ksIGNvbnN0IHN0cnVjdCBtaXBpX2RzaV9tc2cgKm1zZykKPiAgCX0KPiAg Cj4gIAlmb3IgKGkgPSAwOyBpIDwgbXNnLT50eF9sZW47IGkrKykKPiAtCQl3cml0ZWIodHhfYnVm W2ldLCBkc2ktPnJlZ3MgKyBEU0lfQ01EUTAgKyBjbWRxX29mZiArIGkpOwo+ICsJCW10a19kc2lf bWFzayhkc2ksIChyZWdfY21kcV9vZmYgKyBjbWRxX29mZiArIGkpICYgKH4weDNVKSwKPiArCQkJ ICAgICAoMHhmZlVMIDw8ICgoKGkgKyBjbWRxX29mZikgJiAzVSkgKiA4VSkpLAo+ICsJCQkgICAg IHR4X2J1ZltpXSA8PCAoKChpICsgY21kcV9vZmYpICYgM1UpICogOFUpKTsKCllvdSBzYXkgeW91 IHdvdWxkIGZvbGxvdyBOaWNvbGFzJyBzdWdnZXN0aW9uIGhlcmUuCgo+ICAKPiAtCW10a19kc2lf bWFzayhkc2ksIERTSV9DTURRMCwgY21kcV9tYXNrLCByZWdfdmFsKTsKPiArCW10a19kc2lfbWFz ayhkc2ksIHJlZ19jbWRxX29mZiwgY21kcV9tYXNrLCByZWdfdmFsKTsKPiAgCW10a19kc2lfbWFz ayhkc2ksIERTSV9DTURRX1NJWkUsIENNRFFfU0laRSwgY21kcV9zaXplKTsKPiAgfQo+ICAKPiBA QCAtMTA3NCwxMCArMTA4MSwyNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGNvbXBvbmVudF9vcHMg bXRrX2RzaV9jb21wb25lbnRfb3BzID0gewo+ICAJLnVuYmluZCA9IG10a19kc2lfdW5iaW5kLAo+ ICB9Owo+ICAKPiArc3RhdGljIGNvbnN0IHN0cnVjdCBtdGtfZHNpX2RyaXZlcl9kYXRhIG10ODE3 M19kc2lfZHJpdmVyX2RhdGEgPSB7Cj4gKwkucmVnX2NtZHFfb2ZmID0gMHgyMDAsCj4gK307Cj4g Kwo+ICtzdGF0aWMgY29uc3Qgc3RydWN0IG10a19kc2lfZHJpdmVyX2RhdGEgbXQyNzAxX2RzaV9k cml2ZXJfZGF0YSA9IHsKPiArCS5yZWdfY21kcV9vZmYgPSAweDE4MCwKPiArfTsKPiArCj4gK3N0 YXRpYyBjb25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkIG10a19kc2lfb2ZfbWF0Y2hbXSA9IHsKPiAr CXsgLmNvbXBhdGlibGUgPSAibWVkaWF0ZWssbXQyNzAxLWRzaSIsCj4gKwkgIC5kYXRhID0gJm10 MjcwMV9kc2lfZHJpdmVyX2RhdGEgfSwKPiArCXsgLmNvbXBhdGlibGUgPSAibWVkaWF0ZWssbXQ4 MTczLWRzaSIsCj4gKwkgIC5kYXRhID0gJm10ODE3M19kc2lfZHJpdmVyX2RhdGEgfSwKPiArCXsg fSwKPiArfTsKPiArCj4gIHN0YXRpYyBpbnQgbXRrX2RzaV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1f ZGV2aWNlICpwZGV2KQo+ICB7Cj4gIAlzdHJ1Y3QgbXRrX2RzaSAqZHNpOwo+ICAJc3RydWN0IGRl dmljZSAqZGV2ID0gJnBkZXYtPmRldjsKPiArCWNvbnN0IHN0cnVjdCBvZl9kZXZpY2VfaWQgKm9m X2lkOwo+ICAJc3RydWN0IHJlc291cmNlICpyZWdzOwo+ICAJaW50IGlycV9udW07Cj4gIAlpbnQg Y29tcF9pZDsKPiBAQCAtMTEwMSw2ICsxMTI1LDkgQEAgc3RhdGljIGludCBtdGtfZHNpX3Byb2Jl KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCj4gIAlpZiAocmV0KQo+ICAJCWdvdG8gZXJy X3VucmVnaXN0ZXJfaG9zdDsKPiAgCj4gKwlvZl9pZCA9IG9mX21hdGNoX2RldmljZShtdGtfZHNp X29mX21hdGNoLCAmcGRldi0+ZGV2KTsKPiArCWRzaS0+ZHJpdmVyX2RhdGEgPSBvZl9pZC0+ZGF0 YTsKCk1heWJlIHVzZSBvZl9kZXZpY2VfZ2V0X21hdGNoX2RhdGEoKSBpcyBhIG1vcmUgc2ltcGxl IHdheS4gWW91IGNvdWxkCnJlZmVyIHRvIFsxXS4KClsxXQpodHRwczovL2VsaXhpci5ib290bGlu LmNvbS9saW51eC92NS4xL3NvdXJjZS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Rpc3Bf b3ZsLmMjTDMwMAoKUmVnYXJkcywKQ0sKCj4gKwo+ICAJZHNpLT5lbmdpbmVfY2xrID0gZGV2bV9j bGtfZ2V0KGRldiwgImVuZ2luZSIpOwo+ICAJaWYgKElTX0VSUihkc2ktPmVuZ2luZV9jbGspKSB7 Cj4gIAkJcmV0ID0gUFRSX0VSUihkc2ktPmVuZ2luZV9jbGspOwo+IEBAIC0xMTkzLDEyICsxMjIw LDYgQEAgc3RhdGljIGludCBtdGtfZHNpX3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpw ZGV2KQo+ICAJcmV0dXJuIDA7Cj4gIH0KPiAgCj4gLXN0YXRpYyBjb25zdCBzdHJ1Y3Qgb2ZfZGV2 aWNlX2lkIG10a19kc2lfb2ZfbWF0Y2hbXSA9IHsKPiAtCXsgLmNvbXBhdGlibGUgPSAibWVkaWF0 ZWssbXQyNzAxLWRzaSIgfSwKPiAtCXsgLmNvbXBhdGlibGUgPSAibWVkaWF0ZWssbXQ4MTczLWRz aSIgfSwKPiAtCXsgfSwKPiAtfTsKPiAtCj4gIHN0cnVjdCBwbGF0Zm9ybV9kcml2ZXIgbXRrX2Rz aV9kcml2ZXIgPSB7Cj4gIAkucHJvYmUgPSBtdGtfZHNpX3Byb2JlLAo+ICAJLnJlbW92ZSA9IG10 a19kc2lfcmVtb3ZlLAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbA== 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=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,UNPARSEABLE_RELAY,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 52EC4C004C9 for ; Wed, 8 May 2019 02:39:24 +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 2270C214AE for ; Wed, 8 May 2019 02:39:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="QzEPnwf1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2270C214AE 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=zmgjQbwhjj30g6ziGgzV8a4pcjnRdVlibWKnW6480zo=; b=QzEPnwf11NY/kG iUIEIs/XsHHqdFpjh2usIjUotC0luoQwQiApXAb993ZBdgOSg8otEI7c1N09GytHkw1RH2u6k8qlO +9BAUkieo5CYZdLwMXaIkh2sx6FZSF43/NVuYOrMxrvulkVU6oOMoKp2EXp2uFD8lLc/hVgm506TB BQZbedYlkhTSlw/+KgKpBuQq3yBy4sMZOPZtGi5Utm7IzX2LMLShV800zP3psqEwMteI6kx5XE/zM qvdTUQjeyp521SZ6rVafuDnRqa1qD789xS+GnndQgWOH11i8YtA4cK0DSvopVEiXJpFqM+iEQIIYB Dv+Q91pxatDdNdPF4UUQ==; 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 1hOCUK-0002uR-4m; Wed, 08 May 2019 02:39:20 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hOCUG-0002tf-1p; Wed, 08 May 2019 02:39:18 +0000 X-UUID: aceb5425cf7042d888c9082e0c8665c5-20190507 X-UUID: aceb5425cf7042d888c9082e0c8665c5-20190507 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 96997291; Tue, 07 May 2019 18:39:11 -0800 Received: from MTKMBS33DR.mediatek.inc (172.27.6.106) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 7 May 2019 19:39:09 -0700 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS33DR.mediatek.inc (172.27.6.106) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 8 May 2019 10:39:05 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 8 May 2019 10:39:05 +0800 Message-ID: <1557283144.31731.4.camel@mtksdaap41> Subject: Re: [v2 2/5] drm/mediatek: CMDQ reg address of mt8173 is different with mt2701 From: CK Hu To: Jitao Shi Date: Wed, 8 May 2019 10:39:04 +0800 In-Reply-To: <20190416060501.76276-3-jitao.shi@mediatek.com> References: <20190416060501.76276-1-jitao.shi@mediatek.com> <20190416060501.76276-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-20190507_193916_100808_3825402A X-CRM114-Status: GOOD ( 18.03 ) 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 , Kumar Gala , 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 On Tue, 2019-04-16 at 14:04 +0800, Jitao Shi wrote: > Config the different CMDQ reg address in driver data. > For MT8173, you change reg_cmd_off from 0x180 to 0x200, so this patch is a bug fix. You should add a 'Fixes' tag. > 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; > }; > > 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)); You say you would follow Nicolas' suggestion here. > > - 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; Maybe use of_device_get_match_data() is a more simple way. You could refer to [1]. [1] https://elixir.bootlin.com/linux/v5.1/source/drivers/gpu/drm/mediatek/mtk_disp_ovl.c#L300 Regards, CK > + > 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, _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel