From: Mark yao <mark.yao@rock-chips.com>
To: John Keeping <john@metanate.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drm/rockchip: vop: fix mask when updating interrupts
Date: Wed, 13 Jan 2016 16:12:08 +0800 [thread overview]
Message-ID: <569606D8.8060309@rock-chips.com> (raw)
In-Reply-To: <1452621918-32239-1-git-send-email-john@metanate.com>
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 <john@metanate.com>
> ---
> 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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: mark.yao@rock-chips.com (Mark yao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] drm/rockchip: vop: fix mask when updating interrupts
Date: Wed, 13 Jan 2016 16:12:08 +0800 [thread overview]
Message-ID: <569606D8.8060309@rock-chips.com> (raw)
In-Reply-To: <1452621918-32239-1-git-send-email-john@metanate.com>
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 <john@metanate.com>
> ---
> 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
WARNING: multiple messages have this Message-ID (diff)
From: Mark yao <mark.yao@rock-chips.com>
To: John Keeping <john@metanate.com>
Cc: Heiko Stuebner <heiko@sntech.de>,
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
Date: Wed, 13 Jan 2016 16:12:08 +0800 [thread overview]
Message-ID: <569606D8.8060309@rock-chips.com> (raw)
In-Reply-To: <1452621918-32239-1-git-send-email-john@metanate.com>
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 <john@metanate.com>
> ---
> 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
next prev parent reply other threads:[~2016-01-13 8:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-12 18:05 [PATCH] drm/rockchip: vop: fix mask when updating interrupts John Keeping
2016-01-12 18:05 ` John Keeping
2016-01-13 8:12 ` Mark yao [this message]
2016-01-13 8:12 ` Mark yao
2016-01-13 8:12 ` Mark yao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=569606D8.8060309@rock-chips.com \
--to=mark.yao@rock-chips.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=john@metanate.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.