diff options
| author | Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> | 2015-01-28 22:53:53 -0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-10-28 16:38:34 +0100 |
| commit | b53360e0121fdc2378930f3c3da29404fd718b77 (patch) | |
| tree | 3b5b49f943812894f8be2416e8bac93b39baedac | |
| parent | 116814539ff306dd93814f8f72a0da4f0cfb4ebb (diff) | |
| download | linux-stable-b53360e0121fdc2378930f3c3da29404fd718b77.tar.gz linux-stable-b53360e0121fdc2378930f3c3da29404fd718b77.tar.bz2 linux-stable-b53360e0121fdc2378930f3c3da29404fd718b77.zip | |
[media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro
commit 03b36e4dcf422a10da8b67bce2ed00b34ec58aac upstream.
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>
Cc: Oliver Neukum <ONeukum@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/media/platform/vsp1/vsp1_regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h index 1450fa0b63fe..72faf593427e 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 |