From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755125AbcAMIMV (ORCPT ); Wed, 13 Jan 2016 03:12:21 -0500 Received: from regular1.263xmail.com ([211.150.99.134]:37785 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751225AbcAMIMT (ORCPT ); Wed, 13 Jan 2016 03:12:19 -0500 X-263anti-spam: KSV:0;BIG:0;ABS:1;DNS:0;ATT:0;SPF:S; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-ADDR-CHECKED: 0 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <1db1589faa7d855f6065b0149b1caaac> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Message-ID: <569606D8.8060309@rock-chips.com> Date: Wed, 13 Jan 2016 16:12:08 +0800 From: Mark yao User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: John Keeping CC: Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/rockchip: vop: fix mask when updating interrupts References: <1452621918-32239-1-git-send-email-john@metanate.com> In-Reply-To: <1452621918-32239-1-git-send-email-john@metanate.com> 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 On 2016年01月13日 02:05, John Keeping wrote: > Commit dbb3d94 (drm/rockchip: vop: move interrupt registers into > vop_data) introduced new macros for updating the interrupt control > registers but these always use the mask from the register definition > without refining it for the particular bits that are being changed. > > This means that whenever we enable/disable a particular interrupt we end > up disabling all of the others as a side effect. > > Signed-off-by: John Keeping > --- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 46c2a8d..fd37054 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -43,8 +43,8 @@ > > #define REG_SET(x, base, reg, v, mode) \ > __REG_SET_##mode(x, base + reg.offset, reg.mask, reg.shift, v) > -#define REG_SET_MASK(x, base, reg, v, mode) \ > - __REG_SET_##mode(x, base + reg.offset, reg.mask, reg.shift, v) > +#define REG_SET_MASK(x, base, reg, mask, v, mode) \ > + __REG_SET_##mode(x, base + reg.offset, mask, reg.shift, v) > > #define VOP_WIN_SET(x, win, name, v) \ > REG_SET(x, win->base, win->phy->name, v, RELAXED) > @@ -58,16 +58,18 @@ > #define VOP_INTR_GET(vop, name) \ > vop_read_reg(vop, 0, &vop->data->ctrl->name) > > -#define VOP_INTR_SET(vop, name, v) \ > - REG_SET(vop, 0, vop->data->intr->name, v, NORMAL) > +#define VOP_INTR_SET(vop, name, mask, v) \ > + REG_SET_MASK(vop, 0, vop->data->intr->name, mask, v, NORMAL) > #define VOP_INTR_SET_TYPE(vop, name, type, v) \ > do { \ > - int i, reg = 0; \ > + int i, reg = 0, mask = 0; \ > for (i = 0; i < vop->data->intr->nintrs; i++) { \ > - if (vop->data->intr->intrs[i] & type) \ > + if (vop->data->intr->intrs[i] & type) { \ > reg |= (v) << i; \ > + mask |= 1 << i; \ > + } \ > } \ > - VOP_INTR_SET(vop, name, reg); \ > + VOP_INTR_SET(vop, name, mask, reg); \ > } while (0) > #define VOP_INTR_GET_TYPE(vop, name, type) \ > vop_get_intr_type(vop, &vop->data->intr->name, type) Hi John Great, it works for me, Thanks for this fix. Applied to my drm-next branch. -- Ｍark Yao