Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751215AbdGMBqV (ORCPT ); Wed, 12 Jul 2017 21:46:21 -0400 Received: from regular1.263xmail.com ([211.150.99.138]:36829 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751124AbdGMBqU (ORCPT ); Wed, 12 Jul 2017 21:46:20 -0400 X-263anti-spam: KSV:0;BIG:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ADDR-CHECKED4: 1 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-ANTISPAM-LEVEL: 2 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: linux-arm-kernel@lists.infradead.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <56c87858137ec2dd322fa801418755a7> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH v2 3/5] drm/rockchip: vop: move line_flag_num to interrupt registers To: Sean Paul References: <1499824991-7391-1-git-send-email-mark.yao@rock-chips.com> <1499825027-7552-1-git-send-email-mark.yao@rock-chips.com> <20170712175437.6do5shj2evqft7nc@art_vandelay> Cc: Heiko Stuebner , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org From: Mark yao Message-ID: <5966D0E2.8040102@rock-chips.com> Date: Thu, 13 Jul 2017 09:46:10 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20170712175437.6do5shj2evqft7nc@art_vandelay> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4675 Lines: 117 On 2017年07月13日 01:54, Sean Paul wrote: > On Wed, Jul 12, 2017 at 10:03:46AM +0800, Mark Yao wrote: > > Again, please add commit message describing the what and why of this change. > > You can also add: > > Reviewed-by: Sean Paul > Thanks for the review, will fix it at next version. >> Signed-off-by: Mark Yao >> --- >> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +- >> drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 4 ++-- >> drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 8 ++++---- >> 3 files changed, 7 insertions(+), 7 deletions(-) >> >> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> index a9180fd..be208ee 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> @@ -507,7 +507,7 @@ static void vop_line_flag_irq_enable(struct vop *vop, int line_num) >> >> spin_lock_irqsave(&vop->irq_lock, flags); >> >> - VOP_CTRL_SET(vop, line_flag_num[0], line_num); >> + VOP_INTR_SET(vop, line_flag_num[0], line_num); >> VOP_INTR_SET_TYPE(vop, clear, LINE_FLAG_INTR, 1); >> VOP_INTR_SET_TYPE(vop, enable, LINE_FLAG_INTR, 1); >> >> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h >> index e4de890..f64685e 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h >> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h >> @@ -70,8 +70,6 @@ struct vop_ctrl { >> struct vop_reg hpost_st_end; >> struct vop_reg vpost_st_end; >> >> - struct vop_reg line_flag_num[2]; >> - >> struct vop_reg global_regdone_en; >> struct vop_reg cfg_done; >> }; >> @@ -79,6 +77,8 @@ struct vop_ctrl { >> struct vop_intr { >> const int *intrs; >> uint32_t nintrs; >> + >> + struct vop_reg line_flag_num[2]; >> struct vop_reg enable; >> struct vop_reg clear; >> struct vop_reg status; >> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c >> index 7744603..159cedf 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c >> +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c >> @@ -118,6 +118,7 @@ >> static const struct vop_intr rk3036_intr = { >> .intrs = rk3036_vop_intrs, >> .nintrs = ARRAY_SIZE(rk3036_vop_intrs), >> + .line_flag_num[0] = VOP_REG(RK3036_INT_STATUS, 0xfff, 12), >> .status = VOP_REG(RK3036_INT_STATUS, 0xf, 0), >> .enable = VOP_REG(RK3036_INT_STATUS, 0xf, 4), >> .clear = VOP_REG(RK3036_INT_STATUS, 0xf, 8), >> @@ -131,7 +132,6 @@ >> .hact_st_end = VOP_REG(RK3036_DSP_HACT_ST_END, 0x1fff1fff, 0), >> .vtotal_pw = VOP_REG(RK3036_DSP_VTOTAL_VS_END, 0x1fff1fff, 0), >> .vact_st_end = VOP_REG(RK3036_DSP_VACT_ST_END, 0x1fff1fff, 0), >> - .line_flag_num[0] = VOP_REG(RK3036_INT_STATUS, 0xfff, 12), >> .cfg_done = VOP_REG(RK3036_REG_CFG_DONE, 0x1, 0), >> }; >> >> @@ -227,7 +227,6 @@ >> .vact_st_end = VOP_REG(RK3288_DSP_VACT_ST_END, 0x1fff1fff, 0), >> .hpost_st_end = VOP_REG(RK3288_POST_DSP_HACT_INFO, 0x1fff1fff, 0), >> .vpost_st_end = VOP_REG(RK3288_POST_DSP_VACT_INFO, 0x1fff1fff, 0), >> - .line_flag_num[0] = VOP_REG(RK3288_INTR_CTRL0, 0x1fff, 12), >> .global_regdone_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 11), >> .cfg_done = VOP_REG(RK3288_REG_CFG_DONE, 0x1, 0), >> }; >> @@ -259,6 +258,7 @@ >> static const struct vop_intr rk3288_vop_intr = { >> .intrs = rk3288_vop_intrs, >> .nintrs = ARRAY_SIZE(rk3288_vop_intrs), >> + .line_flag_num[0] = VOP_REG(RK3288_INTR_CTRL0, 0x1fff, 12), >> .status = VOP_REG(RK3288_INTR_CTRL0, 0xf, 0), >> .enable = VOP_REG(RK3288_INTR_CTRL0, 0xf, 4), >> .clear = VOP_REG(RK3288_INTR_CTRL0, 0xf, 8), >> @@ -295,8 +295,6 @@ >> .vact_st_end = VOP_REG(RK3399_DSP_VACT_ST_END, 0x1fff1fff, 0), >> .hpost_st_end = VOP_REG(RK3399_POST_DSP_HACT_INFO, 0x1fff1fff, 0), >> .vpost_st_end = VOP_REG(RK3399_POST_DSP_VACT_INFO, 0x1fff1fff, 0), >> - .line_flag_num[0] = VOP_REG(RK3399_LINE_FLAG, 0xffff, 0), >> - .line_flag_num[1] = VOP_REG(RK3399_LINE_FLAG, 0xffff, 16), >> .cfg_done = VOP_REG_MASK(RK3399_REG_CFG_DONE, 0x1, 0), >> }; >> >> @@ -313,6 +311,8 @@ >> static const struct vop_intr rk3399_vop_intr = { >> .intrs = rk3399_vop_intrs, >> .nintrs = ARRAY_SIZE(rk3399_vop_intrs), >> + .line_flag_num[0] = VOP_REG(RK3399_LINE_FLAG, 0xffff, 0), >> + .line_flag_num[1] = VOP_REG(RK3399_LINE_FLAG, 0xffff, 16), >> .status = VOP_REG_MASK(RK3399_INTR_STATUS0, 0xffff, 0), >> .enable = VOP_REG_MASK(RK3399_INTR_EN0, 0xffff, 0), >> .clear = VOP_REG_MASK(RK3399_INTR_CLEAR0, 0xffff, 0), >> -- >> 1.9.1 >> >> -- Ｍark Yao