* [PATCH 1/3] [media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro
@ 2015-01-29 0:53 Nobuhiro Iwamatsu
2015-01-29 0:53 ` [PATCH 2/3] [media] v4l: vsp1: Fix VI6_DPR_ROUTE_FP_MASK macro Nobuhiro Iwamatsu
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Nobuhiro Iwamatsu @ 2015-01-29 0:53 UTC (permalink / raw)
To: laurent.pinchart+renesas; +Cc: linux-media, Nobuhiro Iwamatsu
Clipping size bit of VI6_WPFn _HSZCLIP and VI6_WPFn _VSZCLIP register are from
0 bit to 11 bit. But VI6_WPF_SZCLIP_SIZE_MASK is set to 0x1FFF, this will mask
until the reserve bits. This fixes size for VI6_WPF_SZCLIP_SIZE_MASK.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
drivers/media/platform/vsp1/vsp1_regs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
index da3c573..f61e109 100644
--- a/drivers/media/platform/vsp1/vsp1_regs.h
+++ b/drivers/media/platform/vsp1/vsp1_regs.h
@@ -238,7 +238,7 @@
#define VI6_WPF_SZCLIP_EN (1 << 28)
#define VI6_WPF_SZCLIP_OFST_MASK (0xff << 16)
#define VI6_WPF_SZCLIP_OFST_SHIFT 16
-#define VI6_WPF_SZCLIP_SIZE_MASK (0x1fff << 0)
+#define VI6_WPF_SZCLIP_SIZE_MASK (0xfff << 0)
#define VI6_WPF_SZCLIP_SIZE_SHIFT 0
#define VI6_WPF_OUTFMT 0x100c
--
2.1.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] [media] v4l: vsp1: Fix VI6_DPR_ROUTE_FP_MASK macro
2015-01-29 0:53 [PATCH 1/3] [media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro Nobuhiro Iwamatsu
@ 2015-01-29 0:53 ` Nobuhiro Iwamatsu
2015-01-29 0:53 ` [PATCH 3/3] [media] v4l: vsp1: Fix VI6_DPR_ROUTE_FXA_MASK macro Nobuhiro Iwamatsu
2015-06-18 19:23 ` [PATCH 1/3] [media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro Laurent Pinchart
2 siblings, 0 replies; 4+ messages in thread
From: Nobuhiro Iwamatsu @ 2015-01-29 0:53 UTC (permalink / raw)
To: laurent.pinchart+renesas; +Cc: linux-media, Nobuhiro Iwamatsu
FP bit of VI6_DPR_mod_ROUTE register is 6bit. But VI6_DPR_ROUTE_FP_MASK is set
to 0xFF, this will mask until the reserve bit.
This fixes size for VI6_DPR_ROUTE_FP_MASK.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
drivers/media/platform/vsp1/vsp1_regs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
index f61e109..4177f98 100644
--- a/drivers/media/platform/vsp1/vsp1_regs.h
+++ b/drivers/media/platform/vsp1/vsp1_regs.h
@@ -306,7 +306,7 @@
#define VI6_DPR_BRU_ROUTE 0x204c
#define VI6_DPR_ROUTE_FXA_MASK (0xff << 8)
#define VI6_DPR_ROUTE_FXA_SHIFT 16
-#define VI6_DPR_ROUTE_FP_MASK (0xff << 8)
+#define VI6_DPR_ROUTE_FP_MASK (0x3f << 8)
#define VI6_DPR_ROUTE_FP_SHIFT 8
#define VI6_DPR_ROUTE_RT_MASK (0x3f << 0)
#define VI6_DPR_ROUTE_RT_SHIFT 0
--
2.1.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] [media] v4l: vsp1: Fix VI6_DPR_ROUTE_FXA_MASK macro
2015-01-29 0:53 [PATCH 1/3] [media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro Nobuhiro Iwamatsu
2015-01-29 0:53 ` [PATCH 2/3] [media] v4l: vsp1: Fix VI6_DPR_ROUTE_FP_MASK macro Nobuhiro Iwamatsu
@ 2015-01-29 0:53 ` Nobuhiro Iwamatsu
2015-06-18 19:23 ` [PATCH 1/3] [media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro Laurent Pinchart
2 siblings, 0 replies; 4+ messages in thread
From: Nobuhiro Iwamatsu @ 2015-01-29 0:53 UTC (permalink / raw)
To: laurent.pinchart+renesas; +Cc: linux-media, Nobuhiro Iwamatsu
FXA bit of VI6_DPR_mod_ROUTE register starts from 16bit. But VI6_DPR_ROUTE_FXA_MASK
is set to become start from 8bit. This fixes shift size for VI6_DPR_ROUTE_FXA_MASK.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
drivers/media/platform/vsp1/vsp1_regs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
index 4177f98..25b4873 100644
--- a/drivers/media/platform/vsp1/vsp1_regs.h
+++ b/drivers/media/platform/vsp1/vsp1_regs.h
@@ -304,7 +304,7 @@
#define VI6_DPR_HST_ROUTE 0x2044
#define VI6_DPR_HSI_ROUTE 0x2048
#define VI6_DPR_BRU_ROUTE 0x204c
-#define VI6_DPR_ROUTE_FXA_MASK (0xff << 8)
+#define VI6_DPR_ROUTE_FXA_MASK (0xff << 16)
#define VI6_DPR_ROUTE_FXA_SHIFT 16
#define VI6_DPR_ROUTE_FP_MASK (0x3f << 8)
#define VI6_DPR_ROUTE_FP_SHIFT 8
--
2.1.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] [media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro
2015-01-29 0:53 [PATCH 1/3] [media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro Nobuhiro Iwamatsu
2015-01-29 0:53 ` [PATCH 2/3] [media] v4l: vsp1: Fix VI6_DPR_ROUTE_FP_MASK macro Nobuhiro Iwamatsu
2015-01-29 0:53 ` [PATCH 3/3] [media] v4l: vsp1: Fix VI6_DPR_ROUTE_FXA_MASK macro Nobuhiro Iwamatsu
@ 2015-06-18 19:23 ` Laurent Pinchart
2 siblings, 0 replies; 4+ messages in thread
From: Laurent Pinchart @ 2015-06-18 19:23 UTC (permalink / raw)
To: Nobuhiro Iwamatsu, linux-media
Hi Iwamatsu-san,
I've found this patch series in my inbox, my apologies for not having noticed
it earlier.
On Thursday 29 January 2015 09:53:53 Nobuhiro Iwamatsu wrote:
> Clipping size bit of VI6_WPFn _HSZCLIP and VI6_WPFn _VSZCLIP register are
> from 0 bit to 11 bit. But VI6_WPF_SZCLIP_SIZE_MASK is set to 0x1FFF, this
> will mask until the reserve bits. This fixes size for
> VI6_WPF_SZCLIP_SIZE_MASK.
>
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
The three patches look good to me.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
I've applied them to my tree and will send a pull request to get them merged
in mainline.
> ---
> drivers/media/platform/vsp1/vsp1_regs.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/vsp1/vsp1_regs.h
> b/drivers/media/platform/vsp1/vsp1_regs.h index da3c573..f61e109 100644
> --- a/drivers/media/platform/vsp1/vsp1_regs.h
> +++ b/drivers/media/platform/vsp1/vsp1_regs.h
> @@ -238,7 +238,7 @@
> #define VI6_WPF_SZCLIP_EN (1 << 28)
> #define VI6_WPF_SZCLIP_OFST_MASK (0xff << 16)
> #define VI6_WPF_SZCLIP_OFST_SHIFT 16
> -#define VI6_WPF_SZCLIP_SIZE_MASK (0x1fff << 0)
> +#define VI6_WPF_SZCLIP_SIZE_MASK (0xfff << 0)
> #define VI6_WPF_SZCLIP_SIZE_SHIFT 0
>
> #define VI6_WPF_OUTFMT 0x100c
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-18 19:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-29 0:53 [PATCH 1/3] [media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro Nobuhiro Iwamatsu
2015-01-29 0:53 ` [PATCH 2/3] [media] v4l: vsp1: Fix VI6_DPR_ROUTE_FP_MASK macro Nobuhiro Iwamatsu
2015-01-29 0:53 ` [PATCH 3/3] [media] v4l: vsp1: Fix VI6_DPR_ROUTE_FXA_MASK macro Nobuhiro Iwamatsu
2015-06-18 19:23 ` [PATCH 1/3] [media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro Laurent Pinchart
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).