|
@@ -24,22 +24,24 @@
|
|
|
|
|
|
bool vsp1_entity_is_streaming(struct vsp1_entity *entity)
|
|
bool vsp1_entity_is_streaming(struct vsp1_entity *entity)
|
|
{
|
|
{
|
|
|
|
+ unsigned long flags;
|
|
bool streaming;
|
|
bool streaming;
|
|
|
|
|
|
- mutex_lock(&entity->lock);
|
|
|
|
|
|
+ spin_lock_irqsave(&entity->lock, flags);
|
|
streaming = entity->streaming;
|
|
streaming = entity->streaming;
|
|
- mutex_unlock(&entity->lock);
|
|
|
|
|
|
+ spin_unlock_irqrestore(&entity->lock, flags);
|
|
|
|
|
|
return streaming;
|
|
return streaming;
|
|
}
|
|
}
|
|
|
|
|
|
int vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming)
|
|
int vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming)
|
|
{
|
|
{
|
|
|
|
+ unsigned long flags;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
- mutex_lock(&entity->lock);
|
|
|
|
|
|
+ spin_lock_irqsave(&entity->lock, flags);
|
|
entity->streaming = streaming;
|
|
entity->streaming = streaming;
|
|
- mutex_unlock(&entity->lock);
|
|
|
|
|
|
+ spin_unlock_irqrestore(&entity->lock, flags);
|
|
|
|
|
|
if (!streaming)
|
|
if (!streaming)
|
|
return 0;
|
|
return 0;
|
|
@@ -49,9 +51,9 @@ int vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming)
|
|
|
|
|
|
ret = v4l2_ctrl_handler_setup(entity->subdev.ctrl_handler);
|
|
ret = v4l2_ctrl_handler_setup(entity->subdev.ctrl_handler);
|
|
if (ret < 0) {
|
|
if (ret < 0) {
|
|
- mutex_lock(&entity->lock);
|
|
|
|
|
|
+ spin_lock_irqsave(&entity->lock, flags);
|
|
entity->streaming = false;
|
|
entity->streaming = false;
|
|
- mutex_unlock(&entity->lock);
|
|
|
|
|
|
+ spin_unlock_irqrestore(&entity->lock, flags);
|
|
}
|
|
}
|
|
|
|
|
|
return ret;
|
|
return ret;
|
|
@@ -193,7 +195,7 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,
|
|
if (i == ARRAY_SIZE(vsp1_routes))
|
|
if (i == ARRAY_SIZE(vsp1_routes))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- mutex_init(&entity->lock);
|
|
|
|
|
|
+ spin_lock_init(&entity->lock);
|
|
|
|
|
|
entity->vsp1 = vsp1;
|
|
entity->vsp1 = vsp1;
|
|
entity->source_pad = num_pads - 1;
|
|
entity->source_pad = num_pads - 1;
|
|
@@ -228,6 +230,4 @@ void vsp1_entity_destroy(struct vsp1_entity *entity)
|
|
if (entity->subdev.ctrl_handler)
|
|
if (entity->subdev.ctrl_handler)
|
|
v4l2_ctrl_handler_free(entity->subdev.ctrl_handler);
|
|
v4l2_ctrl_handler_free(entity->subdev.ctrl_handler);
|
|
media_entity_cleanup(&entity->subdev.entity);
|
|
media_entity_cleanup(&entity->subdev.entity);
|
|
-
|
|
|
|
- mutex_destroy(&entity->lock);
|
|
|
|
}
|
|
}
|