* [PATCH] drm/rockchip: vop: fix mask when updating interrupts
@ 2016-01-12 18:05 John Keeping
2016-01-13 8:12 ` Mark yao
0 siblings, 1 reply; 2+ messages in thread
From: John Keeping @ 2016-01-12 18:05 UTC (permalink / raw)
To: Mark Yao
Cc: Heiko Stuebner, dri-devel, linux-arm-kernel, linux-rockchip,
linux-kernel, John Keeping
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)
--
2.7.0.rc3.140.g520a093
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/rockchip: vop: fix mask when updating interrupts
2016-01-12 18:05 [PATCH] drm/rockchip: vop: fix mask when updating interrupts John Keeping
@ 2016-01-13 8:12 ` Mark yao
0 siblings, 0 replies; 2+ messages in thread
From: Mark yao @ 2016-01-13 8:12 UTC (permalink / raw)
To: John Keeping; +Cc: linux-arm-kernel, linux-rockchip, dri-devel, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-13 8:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-12 18:05 [PATCH] drm/rockchip: vop: fix mask when updating interrupts John Keeping
2016-01-13 8:12 ` Mark yao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).