p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] v4l: vsp1: lut: Use display list fragments to fill LUT 

Synchronize the userspace LUT setup with the pipeline operation by using
a display list fragment to store LUT data.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Laurent Pinchart 2016-03-03 14:17:11 -03:00 committed by Mauro Carvalho Chehab
parent f81e83c418
commit 0e6b9c565f
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/media/platform/vsp1/vsp1_lut.c
View File

@ -38,10 +38,25 @@ static inline void vsp1_lut_write(struct vsp1_lut *lut, struct vsp1_dl_list *dl,
* V4L2 Subdevice Core Operations * V4L2 Subdevice Core Operations
*/ */
static void lut_set_table(struct vsp1_lut *lut, struct vsp1_lut_config *config) static int lut_set_table(struct vsp1_lut *lut, struct vsp1_lut_config *config)
{ {
memcpy_toio(lut->entity.vsp1->mmio + VI6_LUT_TABLE, config->lut, struct vsp1_dl_body *dlb;
sizeof(config->lut)); unsigned int i;
dlb = vsp1_dl_fragment_alloc(lut->entity.vsp1, ARRAY_SIZE(config->lut));
if (!dlb)
return -ENOMEM;
for (i = 0; i < ARRAY_SIZE(config->lut); ++i)
vsp1_dl_fragment_write(dlb, VI6_LUT_TABLE + 4 * i,
config->lut[i]);
mutex_lock(&lut->lock);
swap(lut->lut, dlb);
mutex_unlock(&lut->lock);
vsp1_dl_fragment_free(dlb);
return 0;
} }
static long lut_ioctl(struct v4l2_subdev *subdev, unsigned int cmd, void *arg) static long lut_ioctl(struct v4l2_subdev *subdev, unsigned int cmd, void *arg)
@ -50,8 +65,7 @@ static long lut_ioctl(struct v4l2_subdev *subdev, unsigned int cmd, void *arg)
switch (cmd) { switch (cmd) {
case VIDIOC_VSP1_LUT_CONFIG: case VIDIOC_VSP1_LUT_CONFIG:
lut_set_table(lut, arg); return lut_set_table(lut, arg);
return 0;
default: default:
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
@ -161,6 +175,13 @@ static void lut_configure(struct vsp1_entity *entity,
struct vsp1_lut *lut = to_lut(&entity->subdev); struct vsp1_lut *lut = to_lut(&entity->subdev);
vsp1_lut_write(lut, dl, VI6_LUT_CTRL, VI6_LUT_CTRL_EN); vsp1_lut_write(lut, dl, VI6_LUT_CTRL, VI6_LUT_CTRL_EN);
mutex_lock(&lut->lock);
if (lut->lut) {
vsp1_dl_list_add_fragment(dl, lut->lut);
lut->lut = NULL;
}
mutex_unlock(&lut->lock);
} }
static const struct vsp1_entity_operations lut_entity_ops = { static const struct vsp1_entity_operations lut_entity_ops = {

6
drivers/media/platform/vsp1/vsp1_lut.h
View File

@ -13,6 +13,8 @@
#ifndef __VSP1_LUT_H__ #ifndef __VSP1_LUT_H__
#define __VSP1_LUT_H__ #define __VSP1_LUT_H__
#include <linux/mutex.h>
#include <media/media-entity.h> #include <media/media-entity.h>
#include <media/v4l2-subdev.h> #include <media/v4l2-subdev.h>
@ -25,7 +27,9 @@ struct vsp1_device;
struct vsp1_lut { struct vsp1_lut {
struct vsp1_entity entity; struct vsp1_entity entity;
u32 lut[256];
struct mutex lock;
struct vsp1_dl_body *lut;
}; };
static inline struct vsp1_lut *to_lut(struct v4l2_subdev *subdev) static inline struct vsp1_lut *to_lut(struct v4l2_subdev *subdev)