mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 23:58:05 +00:00
Code Issues Releases Wiki Activity

[media] v4l: vsp1: Don't setup control handler when starting streaming

Browse source 
The control handler set operations don't program the hardware anymore,
there's thus no need to call them when starting the stream.

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 2015-11-01 12:58:29 -02:00 committed by Mauro Carvalho Chehab
parent d884a8b2a5
commit 59d0b2bf1d
6 changed files with 6 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/media/platform/vsp1/vsp1_bru.c
View file

@ -66,11 +66,8 @@ static int bru_s_stream(struct v4l2_subdev *subdev, int enable)
struct v4l2_mbus_framefmt *format;
unsigned int flags;
unsigned int i;
int ret;
ret = vsp1_entity_set_streaming(&bru->entity, enable);
if (ret < 0)
return ret;
vsp1_entity_set_streaming(&bru->entity, enable);
if (!enable)
return 0;

18
drivers/media/platform/vsp1/vsp1_entity.c
View file

@ -45,29 +45,13 @@ bool vsp1_entity_is_streaming(struct vsp1_entity *entity)
return streaming;
}
int vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming)
void vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming)
{
unsigned long flags;
int ret;
spin_lock_irqsave(&entity->lock, flags);
entity->streaming = streaming;
spin_unlock_irqrestore(&entity->lock, flags);
if (!streaming)
return 0;
if (!entity->vsp1->info->uapi || !entity->subdev.ctrl_handler)
return 0;
ret = v4l2_ctrl_handler_setup(entity->subdev.ctrl_handler);
if (ret < 0) {
spin_lock_irqsave(&entity->lock, flags);
entity->streaming = false;
spin_unlock_irqrestore(&entity->lock, flags);
}
return ret;
}
void vsp1_entity_route_setup(struct vsp1_entity *source)

2
drivers/media/platform/vsp1/vsp1_entity.h
View file

@ -101,7 +101,7 @@ void vsp1_entity_init_formats(struct v4l2_subdev *subdev,
struct v4l2_subdev_pad_config *cfg);
bool vsp1_entity_is_streaming(struct vsp1_entity *entity);
int vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming);
void vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming);
void vsp1_entity_route_setup(struct vsp1_entity *source);

5
drivers/media/platform/vsp1/vsp1_rpf.c
View file

@ -45,11 +45,8 @@ static int rpf_s_stream(struct v4l2_subdev *subdev, int enable)
const struct v4l2_rect *crop = &rpf->crop;
u32 pstride;
u32 infmt;
int ret;
ret = vsp1_entity_set_streaming(&rpf->entity, enable);
if (ret < 0)
return ret;
vsp1_entity_set_streaming(&rpf->entity, enable);
if (!enable)
return 0;

5
drivers/media/platform/vsp1/vsp1_sru.c
View file

@ -113,11 +113,8 @@ static int sru_s_stream(struct v4l2_subdev *subdev, int enable)
struct v4l2_mbus_framefmt *input;
struct v4l2_mbus_framefmt *output;
u32 ctrl0;
int ret;
ret = vsp1_entity_set_streaming(&sru->entity, enable);
if (ret < 0)
return ret;
vsp1_entity_set_streaming(&sru->entity, enable);
if (!enable)
return 0;

5
drivers/media/platform/vsp1/vsp1_wpf.c
View file

@ -46,11 +46,8 @@ static int wpf_s_stream(struct v4l2_subdev *subdev, int enable)
unsigned int i;
u32 srcrpf = 0;
u32 outfmt = 0;
int ret;
ret = vsp1_entity_set_streaming(&wpf->entity, enable);
if (ret < 0)
return ret;
vsp1_entity_set_streaming(&wpf->entity, enable);
if (!enable) {
vsp1_write(vsp1, VI6_WPF_IRQ_ENB(wpf->entity.index), 0);