Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38fdb8d9 authored by Vincent Abriou's avatar Vincent Abriou
Browse files

drm/sti: fix compositor debugfs creation 



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

Signed-off-by: default avatarVincent Abriou <vincent.abriou@st.com>
Acked-by: default avatarBenjamin Gaignard <benjamin.gaignard@linaro.org>
parent f766c6c8

drivers/gpu/drm/sti/sti_compositor.c

+9 −13
Original line number Diff line number Diff line
@@ -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)

{

	int ret = 0, i;

	unsigned int i;



	for (i = 0; compo->vid[i]; i++) {

		ret = vid_debugfs_init(compo->vid[i], minor);

		if (ret)

			return ret;

	}

	for (i = 0; i < STI_MAX_VID; i++)

		if (compo->vid[i])

			vid_debugfs_init(compo->vid[i], minor);



	for (i = 0; compo->mixer[i]; i++) {

		ret = sti_mixer_debugfs_init(compo->mixer[i], minor);

		if (ret)

			return ret;

	}

	for (i = 0; i < STI_MAX_MIXER; i++)

		if (compo->mixer[i])

			sti_mixer_debugfs_init(compo->mixer[i], minor);



	return 0;

}

drivers/gpu/drm/sti/sti_compositor.h

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct sti_compositor { 
	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);



#endif

drivers/gpu/drm/sti/sti_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int sti_crtc_late_register(struct drm_crtc *crtc) 
	struct sti_compositor *compo = dev_get_drvdata(mixer->dev);



	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;

}