diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-07-10 17:03:46 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-04-23 09:20:15 -0400 |
commit | 629bb6d4b38fe62d36ab52ad22c3ab726f6ce6e8 (patch) | |
tree | f826d26c1ecabf02fd1a3d8be8408e1d637e8ae7 /drivers/media/platform/vsp1/vsp1_drv.c | |
parent | d9b45ed3d8b75e8cf38c8cd1563c29217eecba27 (diff) |
[media] v4l: vsp1: Add BRU support
The Blend ROP Unit performs blending and ROP operations for up to four
sources.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/vsp1/vsp1_drv.c')
-rw-r--r-- | drivers/media/platform/vsp1/vsp1_drv.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c index 3cd2df5af90e..28e1de3270e0 100644 --- a/drivers/media/platform/vsp1/vsp1_drv.c +++ b/drivers/media/platform/vsp1/vsp1_drv.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/videodev2.h> | 20 | #include <linux/videodev2.h> |
21 | 21 | ||
22 | #include "vsp1.h" | 22 | #include "vsp1.h" |
23 | #include "vsp1_bru.h" | ||
23 | #include "vsp1_hsit.h" | 24 | #include "vsp1_hsit.h" |
24 | #include "vsp1_lif.h" | 25 | #include "vsp1_lif.h" |
25 | #include "vsp1_lut.h" | 26 | #include "vsp1_lut.h" |
@@ -155,6 +156,14 @@ static int vsp1_create_entities(struct vsp1_device *vsp1) | |||
155 | } | 156 | } |
156 | 157 | ||
157 | /* Instantiate all the entities. */ | 158 | /* Instantiate all the entities. */ |
159 | vsp1->bru = vsp1_bru_create(vsp1); | ||
160 | if (IS_ERR(vsp1->bru)) { | ||
161 | ret = PTR_ERR(vsp1->bru); | ||
162 | goto done; | ||
163 | } | ||
164 | |||
165 | list_add_tail(&vsp1->bru->entity.list_dev, &vsp1->entities); | ||
166 | |||
158 | vsp1->hsi = vsp1_hsit_create(vsp1, true); | 167 | vsp1->hsi = vsp1_hsit_create(vsp1, true); |
159 | if (IS_ERR(vsp1->hsi)) { | 168 | if (IS_ERR(vsp1->hsi)) { |
160 | ret = PTR_ERR(vsp1->hsi); | 169 | ret = PTR_ERR(vsp1->hsi); |