p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/sti: fix compositor debugfs creation 

Fix typo and issue while creating the vid and mixer debugfs entries.

Signed-off-by: Vincent Abriou <vincent.abriou@st.com>
Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
This commit is contained in:
Vincent Abriou 2016-09-15 17:11:07 +02:00
parent f766c6c810
commit 38fdb8d95f
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/sti/sti_compositor.c
View File

@ -55,22 +55,18 @@ static const struct sti_compositor_data stih416_compositor_data = {
}, },
}; };
int sti_compositor_debufs_init(struct sti_compositor *compo, int sti_compositor_debugfs_init(struct sti_compositor *compo,
struct drm_minor *minor) struct drm_minor *minor)
{ {
int ret = 0, i; unsigned int i;
for (i = 0; compo->vid[i]; i++) { for (i = 0; i < STI_MAX_VID; i++)
ret = vid_debugfs_init(compo->vid[i], minor); if (compo->vid[i])
if (ret) vid_debugfs_init(compo->vid[i], minor);
return ret;
}
for (i = 0; compo->mixer[i]; i++) { for (i = 0; i < STI_MAX_MIXER; i++)
ret = sti_mixer_debugfs_init(compo->mixer[i], minor); if (compo->mixer[i])
if (ret) sti_mixer_debugfs_init(compo->mixer[i], minor);
return ret;
}
return 0; return 0;
} }

4
drivers/gpu/drm/sti/sti_compositor.h
View File

@ -79,7 +79,7 @@ struct sti_compositor {
struct notifier_block vtg_vblank_nb[STI_MAX_MIXER]; struct notifier_block vtg_vblank_nb[STI_MAX_MIXER];
}; };
int sti_compositor_debufs_init(struct sti_compositor *compo, int sti_compositor_debugfs_init(struct sti_compositor *compo,
struct drm_minor *minor); struct drm_minor *minor);
#endif #endif

2
drivers/gpu/drm/sti/sti_crtc.c
View File

@ -338,7 +338,7 @@ static int sti_crtc_late_register(struct drm_crtc *crtc)
struct sti_compositor *compo = dev_get_drvdata(mixer->dev); struct sti_compositor *compo = dev_get_drvdata(mixer->dev);
if (drm_crtc_index(crtc) == 0) if (drm_crtc_index(crtc) == 0)
return sti_compositor_debufs_init(compo, crtc->dev->primary); return sti_compositor_debugfs_init(compo, crtc->dev->primary);
return 0; return 0;
} }