mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-09 06:43:09 +00:00
media: aspeed: add debugfs
To show video real-time information as below: Capture: Signal : Unlock Width : 1920 Height : 1080 FRC : 30 Performance: Frame# : 0 Frame Duration(ms) : Now : 0 Min : 0 Max : 0 FPS : 0 [hverkuil: make aspeed_video_proc_open() static, fixes sparse warning] Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
parent
67f85135c5
commit
52fed10ad7
@ -23,6 +23,8 @@
|
|||||||
#include <linux/videodev2.h>
|
#include <linux/videodev2.h>
|
||||||
#include <linux/wait.h>
|
#include <linux/wait.h>
|
||||||
#include <linux/workqueue.h>
|
#include <linux/workqueue.h>
|
||||||
|
#include <linux/debugfs.h>
|
||||||
|
#include <linux/ktime.h>
|
||||||
#include <media/v4l2-ctrls.h>
|
#include <media/v4l2-ctrls.h>
|
||||||
#include <media/v4l2-dev.h>
|
#include <media/v4l2-dev.h>
|
||||||
#include <media/v4l2-device.h>
|
#include <media/v4l2-device.h>
|
||||||
@ -201,6 +203,14 @@ struct aspeed_video_buffer {
|
|||||||
struct list_head link;
|
struct list_head link;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct aspeed_video_perf {
|
||||||
|
ktime_t last_sample;
|
||||||
|
u32 totaltime;
|
||||||
|
u32 duration;
|
||||||
|
u32 duration_min;
|
||||||
|
u32 duration_max;
|
||||||
|
};
|
||||||
|
|
||||||
#define to_aspeed_video_buffer(x) \
|
#define to_aspeed_video_buffer(x) \
|
||||||
container_of((x), struct aspeed_video_buffer, vb)
|
container_of((x), struct aspeed_video_buffer, vb)
|
||||||
|
|
||||||
@ -242,6 +252,8 @@ struct aspeed_video {
|
|||||||
unsigned int frame_left;
|
unsigned int frame_left;
|
||||||
unsigned int frame_right;
|
unsigned int frame_right;
|
||||||
unsigned int frame_top;
|
unsigned int frame_top;
|
||||||
|
|
||||||
|
struct aspeed_video_perf perf;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define to_aspeed_video(x) container_of((x), struct aspeed_video, v4l2_dev)
|
#define to_aspeed_video(x) container_of((x), struct aspeed_video, v4l2_dev)
|
||||||
@ -465,6 +477,16 @@ static void aspeed_video_write(struct aspeed_video *video, u32 reg, u32 val)
|
|||||||
readl(video->base + reg));
|
readl(video->base + reg));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void update_perf(struct aspeed_video_perf *p)
|
||||||
|
{
|
||||||
|
p->duration =
|
||||||
|
ktime_to_ms(ktime_sub(ktime_get(), p->last_sample));
|
||||||
|
p->totaltime += p->duration;
|
||||||
|
|
||||||
|
p->duration_max = max(p->duration, p->duration_max);
|
||||||
|
p->duration_min = min(p->duration, p->duration_min);
|
||||||
|
}
|
||||||
|
|
||||||
static int aspeed_video_start_frame(struct aspeed_video *video)
|
static int aspeed_video_start_frame(struct aspeed_video *video)
|
||||||
{
|
{
|
||||||
dma_addr_t addr;
|
dma_addr_t addr;
|
||||||
@ -503,6 +525,8 @@ static int aspeed_video_start_frame(struct aspeed_video *video)
|
|||||||
aspeed_video_update(video, VE_INTERRUPT_CTRL, 0,
|
aspeed_video_update(video, VE_INTERRUPT_CTRL, 0,
|
||||||
VE_INTERRUPT_COMP_COMPLETE);
|
VE_INTERRUPT_COMP_COMPLETE);
|
||||||
|
|
||||||
|
video->perf.last_sample = ktime_get();
|
||||||
|
|
||||||
aspeed_video_update(video, VE_SEQ_CTRL, 0,
|
aspeed_video_update(video, VE_SEQ_CTRL, 0,
|
||||||
VE_SEQ_CTRL_TRIG_CAPTURE | VE_SEQ_CTRL_TRIG_COMP);
|
VE_SEQ_CTRL_TRIG_CAPTURE | VE_SEQ_CTRL_TRIG_COMP);
|
||||||
|
|
||||||
@ -618,6 +642,8 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg)
|
|||||||
u32 frame_size = aspeed_video_read(video,
|
u32 frame_size = aspeed_video_read(video,
|
||||||
video->comp_size_read);
|
video->comp_size_read);
|
||||||
|
|
||||||
|
update_perf(&video->perf);
|
||||||
|
|
||||||
spin_lock(&video->lock);
|
spin_lock(&video->lock);
|
||||||
clear_bit(VIDEO_FRAME_INPRG, &video->flags);
|
clear_bit(VIDEO_FRAME_INPRG, &video->flags);
|
||||||
buf = list_first_entry_or_null(&video->buffers,
|
buf = list_first_entry_or_null(&video->buffers,
|
||||||
@ -775,6 +801,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
|
|||||||
det->width = MIN_WIDTH;
|
det->width = MIN_WIDTH;
|
||||||
det->height = MIN_HEIGHT;
|
det->height = MIN_HEIGHT;
|
||||||
video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL;
|
video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL;
|
||||||
|
memset(&video->perf, 0, sizeof(video->perf));
|
||||||
|
|
||||||
do {
|
do {
|
||||||
if (tries) {
|
if (tries) {
|
||||||
@ -1465,6 +1492,8 @@ static int aspeed_video_start_streaming(struct vb2_queue *q,
|
|||||||
struct aspeed_video *video = vb2_get_drv_priv(q);
|
struct aspeed_video *video = vb2_get_drv_priv(q);
|
||||||
|
|
||||||
video->sequence = 0;
|
video->sequence = 0;
|
||||||
|
video->perf.duration_max = 0;
|
||||||
|
video->perf.duration_min = 0xffffffff;
|
||||||
|
|
||||||
rc = aspeed_video_start_frame(video);
|
rc = aspeed_video_start_frame(video);
|
||||||
if (rc) {
|
if (rc) {
|
||||||
@ -1532,6 +1561,71 @@ static const struct vb2_ops aspeed_video_vb2_ops = {
|
|||||||
.buf_queue = aspeed_video_buf_queue,
|
.buf_queue = aspeed_video_buf_queue,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef CONFIG_DEBUG_FS
|
||||||
|
static int aspeed_video_debugfs_show(struct seq_file *s, void *data)
|
||||||
|
{
|
||||||
|
struct aspeed_video *v = s->private;
|
||||||
|
|
||||||
|
seq_puts(s, "\n");
|
||||||
|
|
||||||
|
seq_printf(s, " %-20s:\t%s\n", "Signal",
|
||||||
|
v->v4l2_input_status ? "Unlock" : "Lock");
|
||||||
|
seq_printf(s, " %-20s:\t%d\n", "Width", v->pix_fmt.width);
|
||||||
|
seq_printf(s, " %-20s:\t%d\n", "Height", v->pix_fmt.height);
|
||||||
|
seq_printf(s, " %-20s:\t%d\n", "FRC", v->frame_rate);
|
||||||
|
|
||||||
|
seq_puts(s, "\n");
|
||||||
|
|
||||||
|
seq_puts(s, "Performance:\n");
|
||||||
|
seq_printf(s, " %-20s:\t%d\n", "Frame#", v->sequence);
|
||||||
|
seq_printf(s, " %-20s:\n", "Frame Duration(ms)");
|
||||||
|
seq_printf(s, " %-18s:\t%d\n", "Now", v->perf.duration);
|
||||||
|
seq_printf(s, " %-18s:\t%d\n", "Min", v->perf.duration_min);
|
||||||
|
seq_printf(s, " %-18s:\t%d\n", "Max", v->perf.duration_max);
|
||||||
|
seq_printf(s, " %-20s:\t%d\n", "FPS", 1000 / (v->perf.totaltime / v->sequence));
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int aspeed_video_proc_open(struct inode *inode, struct file *file)
|
||||||
|
{
|
||||||
|
return single_open(file, aspeed_video_debugfs_show, inode->i_private);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct file_operations aspeed_video_debugfs_ops = {
|
||||||
|
.owner = THIS_MODULE,
|
||||||
|
.open = aspeed_video_proc_open,
|
||||||
|
.read = seq_read,
|
||||||
|
.llseek = seq_lseek,
|
||||||
|
.release = single_release,
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct dentry *debugfs_entry;
|
||||||
|
|
||||||
|
static void aspeed_video_debugfs_remove(struct aspeed_video *video)
|
||||||
|
{
|
||||||
|
debugfs_remove_recursive(debugfs_entry);
|
||||||
|
debugfs_entry = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int aspeed_video_debugfs_create(struct aspeed_video *video)
|
||||||
|
{
|
||||||
|
debugfs_entry = debugfs_create_file(DEVICE_NAME, 0444, NULL,
|
||||||
|
video,
|
||||||
|
&aspeed_video_debugfs_ops);
|
||||||
|
if (!debugfs_entry)
|
||||||
|
aspeed_video_debugfs_remove(video);
|
||||||
|
|
||||||
|
return !debugfs_entry ? -EIO : 0;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
static void aspeed_video_debugfs_remove(struct aspeed_video *video) { }
|
||||||
|
static int aspeed_video_debugfs_create(struct aspeed_video *video)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif /* CONFIG_DEBUG_FS */
|
||||||
|
|
||||||
static int aspeed_video_setup_video(struct aspeed_video *video)
|
static int aspeed_video_setup_video(struct aspeed_video *video)
|
||||||
{
|
{
|
||||||
const u64 mask = ~(BIT(V4L2_JPEG_CHROMA_SUBSAMPLING_444) |
|
const u64 mask = ~(BIT(V4L2_JPEG_CHROMA_SUBSAMPLING_444) |
|
||||||
@ -1736,6 +1830,10 @@ static int aspeed_video_probe(struct platform_device *pdev)
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rc = aspeed_video_debugfs_create(video);
|
||||||
|
if (rc)
|
||||||
|
dev_err(video->dev, "debugfs create failed\n");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1747,6 +1845,8 @@ static int aspeed_video_remove(struct platform_device *pdev)
|
|||||||
|
|
||||||
aspeed_video_off(video);
|
aspeed_video_off(video);
|
||||||
|
|
||||||
|
aspeed_video_debugfs_remove(video);
|
||||||
|
|
||||||
clk_unprepare(video->vclk);
|
clk_unprepare(video->vclk);
|
||||||
clk_unprepare(video->eclk);
|
clk_unprepare(video->eclk);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user