From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757573AbcFAJTV (ORCPT ); Wed, 1 Jun 2016 05:19:21 -0400 Received: from lucky1.263xmail.com ([211.157.147.135]:35905 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751001AbcFAJTT (ORCPT ); Wed, 1 Jun 2016 05:19:19 -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: yzq@rock-chips.com 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 From: Yakir Yang To: Mark Yao , Heiko Stuebner , tfiga@chromium.org Cc: David Airlie , daniel.vetter@ffwll.ch, Thierry Reding , dianders@chromium.org, Yakir Yang , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org Subject: [PATCH] drm/rockchip: vop: do axi reset in vop initial time Date: Wed, 1 Jun 2016 17:19:12 +0800 Message-Id: <1464772752-9808-1-git-send-email-ykk@rock-chips.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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"); + 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); + + /* * do hclk_reset, reset all vop registers. */ ahb_rst = devm_reset_control_get(vop->dev, "ahb"); -- 1.9.1