Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0cdac56 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: vsp1: Allocate pipelines on demand 



Instead of embedding pipelines in the vsp1_video objects allocate them
on demand when they are needed. This fixes the streamon race condition
where pipelines objects from different video nodes could be used for the
same pipeline.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 76c29755

drivers/media/platform/vsp1/vsp1_bru.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "vsp1.h"

#include "vsp1_bru.h"

#include "vsp1_dl.h"

#include "vsp1_pipe.h"

#include "vsp1_rwpf.h"

#include "vsp1_video.h"

drivers/media/platform/vsp1/vsp1_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "vsp1_hsit.h"

#include "vsp1_lif.h"

#include "vsp1_lut.h"

#include "vsp1_pipe.h"

#include "vsp1_rwpf.h"

#include "vsp1_sru.h"

#include "vsp1_uds.h"

drivers/media/platform/vsp1/vsp1_pipe.c

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ void vsp1_pipeline_init(struct vsp1_pipeline *pipe) 
	mutex_init(&pipe->lock);

	spin_lock_init(&pipe->irqlock);

	init_waitqueue_head(&pipe->wq);

	kref_init(&pipe->kref);



	INIT_LIST_HEAD(&pipe->entities);

	pipe->state = VSP1_PIPELINE_STOPPED;

drivers/media/platform/vsp1/vsp1_pipe.h

+3 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#ifndef __VSP1_PIPE_H__

#define __VSP1_PIPE_H__



#include <linux/kref.h>

#include <linux/list.h>

#include <linux/spinlock.h>

#include <linux/wait.h>
@@ -63,7 +64,7 @@ enum vsp1_pipeline_state { 
 * @wq: work queue to wait for state change completion

 * @frame_end: frame end interrupt handler

 * @lock: protects the pipeline use count and stream count

 * @use_count: number of video nodes using the pipeline

 * @kref: pipeline reference count

 * @stream_count: number of streaming video nodes

 * @buffers_ready: bitmask of RPFs and WPFs with at least one buffer available

 * @num_inputs: number of RPFs
@@ -86,7 +87,7 @@ struct vsp1_pipeline { 
	void (*frame_end)(struct vsp1_pipeline *pipe);



	struct mutex lock;

	unsigned int use_count;

	struct kref kref;

	unsigned int stream_count;

	unsigned int buffers_ready;

drivers/media/platform/vsp1/vsp1_rpf.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include "vsp1.h"

#include "vsp1_dl.h"

#include "vsp1_pipe.h"

#include "vsp1_rwpf.h"

#include "vsp1_video.h"