]> git.hungrycats.org Git - linux/commitdiff
[media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro
authorNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Thu, 29 Jan 2015 00:53:53 +0000 (22:53 -0200)
committerSasha Levin <sasha.levin@oracle.com>
Thu, 3 Dec 2015 14:58:08 +0000 (09:58 -0500)
[ Upstream commit 03b36e4dcf422a10da8b67bce2ed00b34ec58aac ]

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>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/media/platform/vsp1/vsp1_regs.h

index 70dd7babaa9cfbe6a8d3434c5c0a06a6446409fb..8bf802ca16ace67563a4b3218de4bbc48e8c9d05 100644 (file)
 #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