Skip to content

Commit 90dffef

Browse files
vinceabvinceab
committed
drm/sti: add debugfs entries for VID plane
Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
1 parent 670454b commit 90dffef

File tree

3 files changed

+95
-5
lines changed

3 files changed

+95
-5
lines changed

‎drivers/gpu/drm/sti/sti_compositor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static int sti_compositor_bind(struct device *dev,
7575
switch (desc[i].type) {
7676
case STI_VID_SUBDEV:
7777
compo->vid[vid_id++] =
78-
sti_vid_create(compo->dev, desc[i].id,
78+
sti_vid_create(compo->dev, drm_dev, desc[i].id,
7979
compo->regs + desc[i].offset);
8080
break;
8181
case STI_MIXER_MAIN_SUBDEV:

‎drivers/gpu/drm/sti/sti_vid.c

Lines changed: 92 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,93 @@
5454

5555
#define VID_MIN_HD_HEIGHT 720
5656

57+
#define DBGFS_DUMP(reg) seq_printf(s, "\n %-25s 0x%08X", #reg, \
58+
readl(vid->regs + reg))
59+
60+
static void vid_dbg_ctl(struct seq_file *s, int val)
61+
{
62+
val = val >> 30;
63+
seq_puts(s, "\t");
64+
65+
if (!(val & 1))
66+
seq_puts(s, "NOT ");
67+
seq_puts(s, "ignored on main mixer - ");
68+
69+
if (!(val & 2))
70+
seq_puts(s, "NOT ");
71+
seq_puts(s, "ignored on aux mixer");
72+
}
73+
74+
static void vid_dbg_vpo(struct seq_file *s, int val)
75+
{
76+
seq_printf(s, "\txdo:%4d\tydo:%4d", val & 0x0FFF, (val >> 16) & 0x0FFF);
77+
}
78+
79+
static void vid_dbg_vps(struct seq_file *s, int val)
80+
{
81+
seq_printf(s, "\txds:%4d\tyds:%4d", val & 0x0FFF, (val >> 16) & 0x0FFF);
82+
}
83+
84+
static void vid_dbg_mst(struct seq_file *s, int val)
85+
{
86+
if (val & 1)
87+
seq_puts(s, "\tBUFFER UNDERFLOW!");
88+
}
89+
90+
static int vid_dbg_show(struct seq_file *s, void *arg)
91+
{
92+
struct drm_info_node *node = s->private;
93+
struct sti_vid *vid = (struct sti_vid *)node->info_ent->data;
94+
struct drm_device *dev = node->minor->dev;
95+
int ret;
96+
97+
ret = mutex_lock_interruptible(&dev->struct_mutex);
98+
if (ret)
99+
return ret;
100+
101+
seq_printf(s, "VID: (vaddr= 0x%p)", vid->regs);
102+
103+
DBGFS_DUMP(VID_CTL);
104+
vid_dbg_ctl(s, readl(vid->regs + VID_CTL));
105+
DBGFS_DUMP(VID_ALP);
106+
DBGFS_DUMP(VID_CLF);
107+
DBGFS_DUMP(VID_VPO);
108+
vid_dbg_vpo(s, readl(vid->regs + VID_VPO));
109+
DBGFS_DUMP(VID_VPS);
110+
vid_dbg_vps(s, readl(vid->regs + VID_VPS));
111+
DBGFS_DUMP(VID_KEY1);
112+
DBGFS_DUMP(VID_KEY2);
113+
DBGFS_DUMP(VID_MPR0);
114+
DBGFS_DUMP(VID_MPR1);
115+
DBGFS_DUMP(VID_MPR2);
116+
DBGFS_DUMP(VID_MPR3);
117+
DBGFS_DUMP(VID_MST);
118+
vid_dbg_mst(s, readl(vid->regs + VID_MST));
119+
DBGFS_DUMP(VID_BC);
120+
DBGFS_DUMP(VID_TINT);
121+
DBGFS_DUMP(VID_CSAT);
122+
seq_puts(s, "\n");
123+
124+
mutex_unlock(&dev->struct_mutex);
125+
return 0;
126+
}
127+
128+
static struct drm_info_list vid_debugfs_files[] = {
129+
{ "vid", vid_dbg_show, 0, NULL },
130+
};
131+
132+
static int vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor)
133+
{
134+
unsigned int i;
135+
136+
for (i = 0; i < ARRAY_SIZE(vid_debugfs_files); i++)
137+
vid_debugfs_files[i].data = vid;
138+
139+
return drm_debugfs_create_files(vid_debugfs_files,
140+
ARRAY_SIZE(vid_debugfs_files),
141+
minor->debugfs_root, minor);
142+
}
143+
57144
void sti_vid_commit(struct sti_vid *vid,
58145
struct drm_plane_state *state)
59146
{
@@ -122,8 +209,8 @@ static void sti_vid_init(struct sti_vid *vid)
122209
writel(VID_CSAT_DFLT, vid->regs + VID_CSAT);
123210
}
124211

125-
struct sti_vid *sti_vid_create(struct device *dev, int id,
126-
void __iomem *baseaddr)
212+
struct sti_vid *sti_vid_create(struct device *dev, struct drm_device *drm_dev,
213+
int id, void __iomem *baseaddr)
127214
{
128215
struct sti_vid *vid;
129216

@@ -139,5 +226,8 @@ struct sti_vid *sti_vid_create(struct device *dev, int id,
139226

140227
sti_vid_init(vid);
141228

229+
if (vid_debugfs_init(vid, drm_dev->primary))
230+
DRM_ERROR("VID debugfs setup failed\n");
231+
142232
return vid;
143233
}

‎drivers/gpu/drm/sti/sti_vid.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct sti_vid {
2323
void sti_vid_commit(struct sti_vid *vid,
2424
struct drm_plane_state *state);
2525
void sti_vid_disable(struct sti_vid *vid);
26-
struct sti_vid *sti_vid_create(struct device *dev, int id,
27-
void __iomem *baseaddr);
26+
struct sti_vid *sti_vid_create(struct device *dev, struct drm_device *drm_dev,
27+
int id, void __iomem *baseaddr);
2828

2929
#endif

0 commit comments

Comments
 (0)