openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] v4l: vsp1: Move vsp1_video pointer from vsp1_entity to vsp1_rwpf 

Only RPFs and WPFs can be associated with video nodes, don't waste
memory by storing the video pointer in all entities.

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-08-02 14:58:43 -03:00 committed by Mauro Carvalho Chehab
parent 62a409034c
commit faf2644d8a
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/vsp1/vsp1_drv.c
View File

@ -89,8 +89,8 @@ static int vsp1_create_links(struct vsp1_device *vsp1, struct vsp1_entity *sink)
/* RPFs have no source entities, just connect their source pad
* to their video device.
*/
return media_create_pad_link(&rpf->entity.video->video.entity,
0, &rpf->entity.subdev.entity,
return media_create_pad_link(&rpf->video->video.entity, 0,
&rpf->entity.subdev.entity,
RWPF_PAD_SINK,
MEDIA_LNK_FL_ENABLED |
MEDIA_LNK_FL_IMMUTABLE);
@ -139,7 +139,7 @@ static int vsp1_create_links(struct vsp1_device *vsp1, struct vsp1_entity *sink)
return media_create_pad_link(&wpf->entity.subdev.entity,
RWPF_PAD_SOURCE,
&wpf->entity.video->video.entity,
&wpf->video->video.entity,
0, flags);
}

3
drivers/media/platform/vsp1/vsp1_entity.h
View File

@ -19,7 +19,6 @@
#include <media/v4l2-subdev.h>
struct vsp1_device;
struct vsp1_video;
enum vsp1_entity_type {
VSP1_ENTITY_BRU,
@ -71,8 +70,6 @@ struct vsp1_entity {
struct v4l2_subdev subdev;
struct v4l2_mbus_framefmt *formats;
struct vsp1_video *video;
spinlock_t lock; /* Protects the streaming field */
bool streaming;
};

3
drivers/media/platform/vsp1/vsp1_rwpf.h
View File

@ -24,6 +24,7 @@
#define RWPF_PAD_SOURCE 1
struct vsp1_rwpf;
struct vsp1_video;
struct vsp1_rwpf_memory {
unsigned int num_planes;
@ -40,6 +41,8 @@ struct vsp1_rwpf {
struct vsp1_entity entity;
struct v4l2_ctrl_handler ctrls;
struct vsp1_video *video;
const struct vsp1_rwpf_operations *ops;
unsigned int max_width;

10
drivers/media/platform/vsp1/vsp1_video.c
View File

@ -448,11 +448,11 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
if (e->type == VSP1_ENTITY_RPF) {
rwpf = to_rwpf(subdev);
pipe->inputs[pipe->num_inputs++] = rwpf;
rwpf->entity.video->pipe_index = pipe->num_inputs;
rwpf->video->pipe_index = pipe->num_inputs;
} else if (e->type == VSP1_ENTITY_WPF) {
rwpf = to_rwpf(subdev);
pipe->output = to_rwpf(subdev);
rwpf->entity.video->pipe_index = 0;
rwpf->video->pipe_index = 0;
} else if (e->type == VSP1_ENTITY_LIF) {
pipe->lif = e;
} else if (e->type == VSP1_ENTITY_BRU) {
@ -664,10 +664,10 @@ void vsp1_pipeline_frame_end(struct vsp1_pipeline *pipe)
/* Complete buffers on all video nodes. */
for (i = 0; i < pipe->num_inputs; ++i)
vsp1_video_frame_end(pipe, pipe->inputs[i]->entity.video);
vsp1_video_frame_end(pipe, pipe->inputs[i]->video);
if (!pipe->lif)
vsp1_video_frame_end(pipe, pipe->output->entity.video);
vsp1_video_frame_end(pipe, pipe->output->video);
spin_lock_irqsave(&pipe->irqlock, flags);
@ -1217,7 +1217,7 @@ struct vsp1_video *vsp1_video_create(struct vsp1_device *vsp1,
if (!video)
return ERR_PTR(-ENOMEM);
rwpf->entity.video = video;
rwpf->video = video;
video->vsp1 = vsp1;
video->rwpf = rwpf;