fce34e49e4
The suspend and resume handlers are only utilised by video pipelines, yet the functions currently reside in the vsp1_pipe object. This causes an issue with resume, as the functions incorrectly call vsp1_pipeline_run() directly instead of processing the video object through vsp1_video_pipeline_run(). Move the functions to the video object, renaming accordingly and update the resume handler to call vsp1_video_pipeline_run() as appropriate. Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
62 lines
1.3 KiB
C
62 lines
1.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* vsp1_video.h -- R-Car VSP1 Video Node
|
|
*
|
|
* Copyright (C) 2013-2015 Renesas Electronics Corporation
|
|
*
|
|
* Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
|
|
*/
|
|
#ifndef __VSP1_VIDEO_H__
|
|
#define __VSP1_VIDEO_H__
|
|
|
|
#include <linux/list.h>
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <media/videobuf2-v4l2.h>
|
|
|
|
#include "vsp1_rwpf.h"
|
|
|
|
struct vsp1_vb2_buffer {
|
|
struct vb2_v4l2_buffer buf;
|
|
struct list_head queue;
|
|
struct vsp1_rwpf_memory mem;
|
|
};
|
|
|
|
static inline struct vsp1_vb2_buffer *
|
|
to_vsp1_vb2_buffer(struct vb2_v4l2_buffer *vbuf)
|
|
{
|
|
return container_of(vbuf, struct vsp1_vb2_buffer, buf);
|
|
}
|
|
|
|
struct vsp1_video {
|
|
struct list_head list;
|
|
struct vsp1_device *vsp1;
|
|
struct vsp1_rwpf *rwpf;
|
|
|
|
struct video_device video;
|
|
enum v4l2_buf_type type;
|
|
struct media_pad pad;
|
|
|
|
struct mutex lock;
|
|
|
|
unsigned int pipe_index;
|
|
|
|
struct vb2_queue queue;
|
|
spinlock_t irqlock;
|
|
struct list_head irqqueue;
|
|
};
|
|
|
|
static inline struct vsp1_video *to_vsp1_video(struct video_device *vdev)
|
|
{
|
|
return container_of(vdev, struct vsp1_video, video);
|
|
}
|
|
|
|
void vsp1_video_suspend(struct vsp1_device *vsp1);
|
|
void vsp1_video_resume(struct vsp1_device *vsp1);
|
|
|
|
struct vsp1_video *vsp1_video_create(struct vsp1_device *vsp1,
|
|
struct vsp1_rwpf *rwpf);
|
|
void vsp1_video_cleanup(struct vsp1_video *video);
|
|
|
|
#endif /* __VSP1_VIDEO_H__ */
|