From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yakir Yang Subject: Re: [PATCH] drm/rockchip: vop: do axi reset in vop initial time Date: Thu, 2 Jun 2016 11:11:41 +0800 Message-ID: <574FA3ED.3000107@rock-chips.com> References: <1464772752-9808-1-git-send-email-ykk@rock-chips.com> <20160601151956.GA29316@ulmo.ba.sec> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160601151956.GA29316@ulmo.ba.sec> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Thierry Reding Cc: linux-rockchip@lists.infradead.org, Mark Yao , daniel.vetter@ffwll.ch, dianders@chromium.org, dri-devel@lists.freedesktop.org, tfiga@chromium.org, linux-kernel@vger.kernel.org List-Id: linux-rockchip.vger.kernel.org Ck9uIDA2LzAxLzIwMTYgMTE6MTkgUE0sIFRoaWVycnkgUmVkaW5nIHdyb3RlOgo+IE9uIFdlZCwg SnVuIDAxLCAyMDE2IGF0IDA1OjE5OjEyUE0gKzA4MDAsIFlha2lyIFlhbmcgd3JvdGU6Cj4+IFRo ZXJlIGlzIGEgYnVnIGluIFJLMzM5OSBWT1AsIHdoZW4gYm9vdGxvYWRlci9rZXJuZWwgb25seSBl bmFibGUKPj4gVk9QIEJpZyBvciBWT1AgTGl0dGxlIHRvIGRpc3BsYXksIHRoZW4gVk9QIElPTU1V IHdvdWxkIGZhaWxlZCB0bwo+PiByZXNldCBhdCB0aGUgaW5pdGlhbCB0aW1lIGFuZCBWT1AgcmVn aXN0ZXIgY291bGRuJ3Qgd3JpdGUgcmlnaHRseS4KPj4KPj4gQWZ0ZXIgZG8gdGhlIHB1cmUgcmVz ZXQgb2YgVk9QIG1vZHVsZSwgdGhlbiB0aGluZ3MgYmFjayB0byByaWdodC4KPj4KPj4gU2lnbmVk LW9mZi1ieTogWWFraXIgWWFuZyA8eWtrQHJvY2stY2hpcHMuY29tPgo+PiAtLS0KPj4gICBkcml2 ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jIHwgMTUgKysrKysrKysrKysr KystCj4+ICAgMSBmaWxlIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkK Pj4KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1f dm9wLmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jCj4+IGlu ZGV4IDFjNGQ1YjUuLjQxNTAzMjMgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2Nr Y2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMKPj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlw L3JvY2tjaGlwX2RybV92b3AuYwo+PiBAQCAtMTI5Miw3ICsxMjkyLDcgQEAgc3RhdGljIGludCB2 b3BfaW5pdGlhbChzdHJ1Y3Qgdm9wICp2b3ApCj4+ICAgewo+PiAgIAljb25zdCBzdHJ1Y3Qgdm9w X2RhdGEgKnZvcF9kYXRhID0gdm9wLT5kYXRhOwo+PiAgIAljb25zdCBzdHJ1Y3Qgdm9wX3JlZ19k YXRhICppbml0X3RhYmxlID0gdm9wX2RhdGEtPmluaXRfdGFibGU7Cj4+IC0Jc3RydWN0IHJlc2V0 X2NvbnRyb2wgKmFoYl9yc3Q7Cj4+ICsJc3RydWN0IHJlc2V0X2NvbnRyb2wgKmFoYl9yc3QsICph eGlfcnN0Owo+PiAgIAlpbnQgaSwgcmV0Owo+PiAgIAo+PiAgIAl2b3AtPmhjbGsgPSBkZXZtX2Ns a19nZXQodm9wLT5kZXYsICJoY2xrX3ZvcCIpOwo+PiBAQCAtMTMzMSw2ICsxMzMxLDE5IEBAIHN0 YXRpYyBpbnQgdm9wX2luaXRpYWwoc3RydWN0IHZvcCAqdm9wKQo+PiAgIAl9Cj4+ICAgCj4+ICAg CS8qCj4+ICsJICogZG8gYWNsa19yZXNldCwgcmVzZXQgYWxsIHZvcCByZWdpc3RlcnMuCj4+ICsJ ICovCj4+ICsJYXhpX3JzdCA9IGRldm1fcmVzZXRfY29udHJvbF9nZXQodm9wLT5kZXYsICJheGki KTsKPiBJIGRvbid0IHRoaW5rIHlvdSB3YW50IHRoZSBtYW5hZ2VkIHZlcnNpb24gaGVyZSBzaW5j ZSB5b3Ugb25seSBzdG9yZQo+IHRoaXMgaW4gYSBsb2NhbCB2YXJpYWJsZSBhbmQgaGVuY2UgYXJl bid0IGdvaW5nIHRvIG5lZWQgaXQgYWZ0ZXJ3YXJkcy4KPiBKdXN0IHVzZSByZXNldF9jb250cm9s X2dldCgpIGFuZCAuLi4KCkdyZWF0LCBidXQgc2VlbXMgTWFyayB3b3VsZCBub3QgYWNjZXB0IHRo aXMgZml4IG5vdyA6KApNYXliZSBJIHNob3VsZCBmb3VuZCB0aGUgcm9vdCBjYXVzZSB3aHkgbXkg Ym9vdGxvYWRlci9rZXJuZWwgd291bGQgCmJyb2tlbiB0aGUgVk9QLgoKVGhhbmtzLAotIFlha2ly Cj4+ICsJaWYgKElTX0VSUihheGlfcnN0KSkgewo+PiArCQlkZXZfZXJyKHZvcC0+ZGV2LCAiZmFp bGVkIHRvIGdldCBheGkgcmVzZXRcbiIpOwo+PiArCQlyZXQgPSBQVFJfRVJSKGF4aV9yc3QpOwo+ PiArCQlnb3RvIGVycl9kaXNhYmxlX2FjbGs7Cj4+ICsJfQo+PiArCXJlc2V0X2NvbnRyb2xfYXNz ZXJ0KGF4aV9yc3QpOwo+PiArCXVzbGVlcF9yYW5nZSgxMCwgMjApOwo+PiArCXJlc2V0X2NvbnRy b2xfZGVhc3NlcnQoYXhpX3JzdCk7Cj4gY2FsbCByZXNldF9jb250cm9sX3B1dCgpIGhlcmUuCj4K Pj4gKwo+PiArCS8qCj4+ICAgCSAqIGRvIGhjbGtfcmVzZXQsIHJlc2V0IGFsbCB2b3AgcmVnaXN0 ZXJzLgo+PiAgIAkgKi8KPj4gICAJYWhiX3JzdCA9IGRldm1fcmVzZXRfY29udHJvbF9nZXQodm9w LT5kZXYsICJhaGIiKTsKPiBUaGlzIHVzZXMgdGhlIHNhbWUgcGF0dGVybiwgc28geW91IG1pZ2h0 IHdhbnQgdG8gY29uc2lkZXIgcmV3b3JraW5nIHRoaXMKPiBhcyB3ZWxsLCB0aG91Z2ggaXQgc2hv dWxkIGJlIGEgc2VwYXJhdGUgcGF0Y2guCj4KPiBUaGllcnJ5CgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752544AbcFBDL4 (ORCPT ); Wed, 1 Jun 2016 23:11:56 -0400 Received: from lucky1.263xmail.com ([211.157.147.131]:45316 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752112AbcFBDLy (ORCPT ); Wed, 1 Jun 2016 23:11:54 -0400 X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: ykk@rock-chips.com X-FST-TO: linux-rockchip@lists.infradead.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: ykk@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH] drm/rockchip: vop: do axi reset in vop initial time To: Thierry Reding References: <1464772752-9808-1-git-send-email-ykk@rock-chips.com> <20160601151956.GA29316@ulmo.ba.sec> Cc: Mark Yao , Heiko Stuebner , tfiga@chromium.org, David Airlie , daniel.vetter@ffwll.ch, dianders@chromium.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org From: Yakir Yang Message-ID: <574FA3ED.3000107@rock-chips.com> Date: Thu, 2 Jun 2016 11:11:41 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <20160601151956.GA29316@ulmo.ba.sec> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/01/2016 11:19 PM, Thierry Reding wrote: > On Wed, Jun 01, 2016 at 05:19:12PM +0800, Yakir Yang wrote: >> There is a bug in RK3399 VOP, when bootloader/kernel only enable >> VOP Big or VOP Little to display, then VOP IOMMU would failed to >> reset at the initial time and VOP register couldn't write rightly. >> >> After do the pure reset of VOP module, then things back to right. >> >> Signed-off-by: Yakir Yang >> --- >> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 ++++++++++++++- >> 1 file changed, 14 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> index 1c4d5b5..4150323 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> @@ -1292,7 +1292,7 @@ static int vop_initial(struct vop *vop) >> { >> const struct vop_data *vop_data = vop->data; >> const struct vop_reg_data *init_table = vop_data->init_table; >> - struct reset_control *ahb_rst; >> + struct reset_control *ahb_rst, *axi_rst; >> int i, ret; >> >> vop->hclk = devm_clk_get(vop->dev, "hclk_vop"); >> @@ -1331,6 +1331,19 @@ static int vop_initial(struct vop *vop) >> } >> >> /* >> + * do aclk_reset, reset all vop registers. >> + */ >> + axi_rst = devm_reset_control_get(vop->dev, "axi"); > I don't think you want the managed version here since you only store > this in a local variable and hence aren't going to need it afterwards. > Just use reset_control_get() and ... Great, but seems Mark would not accept this fix now :( Maybe I should found the root cause why my bootloader/kernel would broken the VOP. Thanks, - Yakir >> + if (IS_ERR(axi_rst)) { >> + dev_err(vop->dev, "failed to get axi reset\n"); >> + ret = PTR_ERR(axi_rst); >> + goto err_disable_aclk; >> + } >> + reset_control_assert(axi_rst); >> + usleep_range(10, 20); >> + reset_control_deassert(axi_rst); > call reset_control_put() here. > >> + >> + /* >> * do hclk_reset, reset all vop registers. >> */ >> ahb_rst = devm_reset_control_get(vop->dev, "ahb"); > This uses the same pattern, so you might want to consider reworking this > as well, though it should be a separate patch. > > Thierry