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

Commit dcec16ef authored by Thierry Reding's avatar Thierry Reding Committed by Vincent Abriou
Browse files

drm/sti: Build monolithic driver 



There's no use building the individual drivers as separate modules
because they are all only useful if combined into a single DRM/KMS
device.

Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarVincent Abriou <vincent.abriou@st.com>
parent 2388693e

drivers/gpu/drm/sti/Makefile

+9 −12
Original line number Diff line number Diff line 
sticompositor-y := \

sti-drm-y := \

	sti_mixer.o \

	sti_gdp.o \

	sti_vid.o \

	sti_cursor.o \

	sti_compositor.o \

	sti_crtc.o \

	sti_plane.o



stihdmi-y := sti_hdmi.o \

	sti_plane.o \

	sti_crtc.o \

	sti_plane.o \

	sti_hdmi.o \

	sti_hdmi_tx3g0c55phy.o \

	sti_hdmi_tx3g4c28phy.o \



stidvo-y := sti_dvo.o \

	sti_awg_utils.o



obj-$(CONFIG_DRM_STI) = \

	sti_dvo.o \

	sti_awg_utils.o \

	sti_vtg.o \

	sti_vtac.o \

	stihdmi.o \

	sti_hda.o \

	sti_tvout.o \

	sticompositor.o \

	sti_hqvdp.o \

	stidvo.o \

	sti_drv.o



obj-$(CONFIG_DRM_STI) = sti-drm.o

drivers/gpu/drm/sti/sti_compositor.c

+1 −3
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static int sti_compositor_remove(struct platform_device *pdev) 
	return 0;

}



static struct platform_driver sti_compositor_driver = {

struct platform_driver sti_compositor_driver = {

	.driver = {

		.name = "sti-compositor",

		.of_match_table = compositor_of_match,
@@ -272,8 +272,6 @@ static struct platform_driver sti_compositor_driver = { 
	.remove = sti_compositor_remove,

};



module_platform_driver(sti_compositor_driver);



MODULE_AUTHOR("Benjamin Gaignard <benjamin.gaignard@st.com>");

MODULE_DESCRIPTION("STMicroelectronics SoC DRM driver");

MODULE_LICENSE("GPL");

drivers/gpu/drm/sti/sti_drv.c

+23 −1
Original line number Diff line number Diff line
@@ -287,7 +287,29 @@ static struct platform_driver sti_platform_driver = { 
	},

};



module_platform_driver(sti_platform_driver);

static struct platform_driver * const drivers[] = {

	&sti_tvout_driver,

	&sti_vtac_driver,

	&sti_hqvdp_driver,

	&sti_hdmi_driver,

	&sti_hda_driver,

	&sti_dvo_driver,

	&sti_vtg_driver,

	&sti_compositor_driver,

	&sti_platform_driver,

};



static int sti_drm_init(void)

{

	return platform_register_drivers(drivers, ARRAY_SIZE(drivers));

}

module_init(sti_drm_init);



static void sti_drm_exit(void)

{

	platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));

}

module_exit(sti_drm_exit);



MODULE_AUTHOR("Benjamin Gaignard <benjamin.gaignard@st.com>");

MODULE_DESCRIPTION("STMicroelectronics SoC DRM driver");

drivers/gpu/drm/sti/sti_drv.h

+9 −0
Original line number Diff line number Diff line
@@ -32,4 +32,13 @@ struct sti_private { 
	} commit;

};



extern struct platform_driver sti_tvout_driver;

extern struct platform_driver sti_vtac_driver;

extern struct platform_driver sti_hqvdp_driver;

extern struct platform_driver sti_hdmi_driver;

extern struct platform_driver sti_hda_driver;

extern struct platform_driver sti_dvo_driver;

extern struct platform_driver sti_vtg_driver;

extern struct platform_driver sti_compositor_driver;



#endif

drivers/gpu/drm/sti/sti_dvo.c

+0 −2
Original line number Diff line number Diff line
@@ -558,8 +558,6 @@ struct platform_driver sti_dvo_driver = { 
	.remove = sti_dvo_remove,

};



module_platform_driver(sti_dvo_driver);



MODULE_AUTHOR("Benjamin Gaignard <benjamin.gaignard@st.com>");

MODULE_DESCRIPTION("STMicroelectronics SoC DRM driver");

MODULE_LICENSE("GPL");