iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] v4l: vsp1: lut: Support runtime modification of controls

Browse Source 
Allow reconfiguration of the look-up table at runtime.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Laurent Pinchart 2016-06-11 04:11:27 -03:00 committed by Mauro Carvalho Chehab
parent fc845e520b
commit f4e37fb73f
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,9 @@ static int lut_set_table(struct vsp1_lut *lut, struct v4l2_ctrl *ctrl)
vsp1_dl_fragment_write(dlb, VI6_LUT_TABLE + 4 * i, vsp1_dl_fragment_write(dlb, VI6_LUT_TABLE + 4 * i,
ctrl->p_new.p_u32[i]); ctrl->p_new.p_u32[i]);
spin_lock_irq(&lut->lock);
swap(lut->lut, dlb); swap(lut->lut, dlb);
spin_unlock_irq(&lut->lock);
vsp1_dl_fragment_free(dlb); vsp1_dl_fragment_free(dlb);
return 0; return 0;
@ -184,20 +186,21 @@ static void lut_configure(struct vsp1_entity *entity,
struct vsp1_dl_list *dl, bool full) struct vsp1_dl_list *dl, bool full)
{ {
struct vsp1_lut *lut = to_lut(&entity->subdev); struct vsp1_lut *lut = to_lut(&entity->subdev);
struct vsp1_dl_body *dlb;
unsigned long flags;
if (!full) if (full) {
vsp1_lut_write(lut, dl, VI6_LUT_CTRL, VI6_LUT_CTRL_EN);
return; return;
vsp1_lut_write(lut, dl, VI6_LUT_CTRL, VI6_LUT_CTRL_EN);
mutex_lock(lut->ctrls.lock);
if (lut->lut) {
vsp1_dl_list_add_fragment(dl, lut->lut);
lut->lut = NULL;
} }
mutex_unlock(lut->ctrls.lock); spin_lock_irqsave(&lut->lock, flags);
dlb = lut->lut;
lut->lut = NULL;
spin_unlock_irqrestore(&lut->lock, flags);
if (dlb)
vsp1_dl_list_add_fragment(dl, dlb);
} }
static const struct vsp1_entity_operations lut_entity_ops = { static const struct vsp1_entity_operations lut_entity_ops = {
@ -217,6 +220,8 @@ struct vsp1_lut *vsp1_lut_create(struct vsp1_device *vsp1)
if (lut == NULL) if (lut == NULL)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
spin_lock_init(&lut->lock);
lut->entity.ops = &lut_entity_ops; lut->entity.ops = &lut_entity_ops;
lut->entity.type = VSP1_ENTITY_LUT; lut->entity.type = VSP1_ENTITY_LUT;

3
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/spinlock.h>
#include <media/media-entity.h> #include <media/media-entity.h>
#include <media/v4l2-ctrls.h> #include <media/v4l2-ctrls.h>
#include <media/v4l2-subdev.h> #include <media/v4l2-subdev.h>
@ -29,6 +31,7 @@ struct vsp1_lut {
struct v4l2_ctrl_handler ctrls; struct v4l2_ctrl_handler ctrls;
spinlock_t lock;
struct vsp1_dl_body *lut; struct vsp1_dl_body *lut;
}; };