| Message ID | 20171013145944.26557-5-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Fri, Oct 13, 2017 at 05:59:00PM +0300, Laurent Pinchart wrote: > There's no need for the omapdss-base code to be part of a separate > module. Merge it with the omapdss module. This allows removing the > exports for internal symbols. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/gpu/drm/omapdrm/dss/Kconfig | 4 ---- > drivers/gpu/drm/omapdrm/dss/Makefile | 19 +++++++++++++------ > drivers/gpu/drm/omapdrm/dss/base.c | 7 ------- > drivers/gpu/drm/omapdrm/dss/display.c | 2 -- > drivers/gpu/drm/omapdrm/dss/dss-of.c | 2 -- > drivers/gpu/drm/omapdrm/dss/output.c | 14 -------------- > 6 files changed, 13 insertions(+), 35 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/dss/Kconfig b/drivers/gpu/drm/omapdrm/dss/Kconfig > index f24ebf7f61dd..39a30a64448a 100644 > --- a/drivers/gpu/drm/omapdrm/dss/Kconfig > +++ b/drivers/gpu/drm/omapdrm/dss/Kconfig > @@ -1,12 +1,8 @@ > config OMAP2_DSS_INIT > bool > > -config OMAP_DSS_BASE > - tristate > - > menuconfig OMAP2_DSS > tristate "OMAP2+ Display Subsystem support" > - select OMAP_DSS_BASE > select VIDEOMODE_HELPERS > select OMAP2_DSS_INIT > select HDMI > diff --git a/drivers/gpu/drm/omapdrm/dss/Makefile b/drivers/gpu/drm/omapdrm/dss/Makefile > index 3c5644c3fc38..531b4d8075e5 100644 > --- a/drivers/gpu/drm/omapdrm/dss/Makefile > +++ b/drivers/gpu/drm/omapdrm/dss/Makefile > @@ -1,12 +1,19 @@ > obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o > - > -obj-$(CONFIG_OMAP_DSS_BASE) += omapdss-base.o > -omapdss-base-y := base.o display.o dss-of.o output.o > - > obj-$(CONFIG_OMAP2_DSS) += omapdss.o > + > # Core DSS files > -omapdss-y := core.o dss.o dispc.o dispc_coefs.o \ > - pll.o video-pll.o > +omapdss-y := \ > + base.o \ > + display.o \ > + dss-of.o \ > + output.o \ > + core.o \ > + dss.o \ > + dispc.o \ > + dispc_coefs.o \ > + pll.o \ > + video-pll.o > + I guess it makes sense to sort this alphabetically, otherwise: Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> -- Sebastian > omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o > omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o > omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o > diff --git a/drivers/gpu/drm/omapdrm/dss/base.c b/drivers/gpu/drm/omapdrm/dss/base.c > index 13e91faaf7a6..eff427dd3297 100644 > --- a/drivers/gpu/drm/omapdrm/dss/base.c > +++ b/drivers/gpu/drm/omapdrm/dss/base.c > @@ -20,7 +20,6 @@ void omapdss_set_is_initialized(bool set) > { > dss_initialized = set; > } > -EXPORT_SYMBOL(omapdss_set_is_initialized); > > bool omapdss_is_initialized(void) > { > @@ -32,7 +31,6 @@ void dispc_set_ops(const struct dispc_ops *o) > { > ops = o; > } > -EXPORT_SYMBOL(dispc_set_ops); > > const struct dispc_ops *dispc_get_ops(void) > { > @@ -108,7 +106,6 @@ void omapdss_gather_components(struct device *dev) > omapdss_walk_device(dev, child, true); > } > } > -EXPORT_SYMBOL(omapdss_gather_components); > > static bool omapdss_component_is_loaded(struct omapdss_comp_node *comp) > { > @@ -134,7 +131,3 @@ bool omapdss_stack_is_ready(void) > return true; > } > EXPORT_SYMBOL(omapdss_stack_is_ready); > - > -MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>"); > -MODULE_DESCRIPTION("OMAP Display Subsystem Base"); > -MODULE_LICENSE("GPL v2"); > diff --git a/drivers/gpu/drm/omapdrm/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c > index 8c77a2d20969..a86471f73094 100644 > --- a/drivers/gpu/drm/omapdrm/dss/display.c > +++ b/drivers/gpu/drm/omapdrm/dss/display.c > @@ -35,7 +35,6 @@ void omapdss_default_get_timings(struct omap_dss_device *dssdev, > { > *vm = dssdev->panel.vm; > } > -EXPORT_SYMBOL(omapdss_default_get_timings); > > static LIST_HEAD(panel_list); > static DEFINE_MUTEX(panel_list_mutex); > @@ -104,7 +103,6 @@ bool omapdss_component_is_display(struct device_node *node) > mutex_unlock(&panel_list_mutex); > return found; > } > -EXPORT_SYMBOL(omapdss_component_is_display); > > struct omap_dss_device *omap_dss_get_device(struct omap_dss_device *dssdev) > { > diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c > index c6b86f348a5c..d3a19a5dfd35 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dss-of.c > +++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c > @@ -44,7 +44,6 @@ struct device_node *dss_of_port_get_parent_device(struct device_node *port) > > return NULL; > } > -EXPORT_SYMBOL_GPL(dss_of_port_get_parent_device); > > u32 dss_of_port_get_port_number(struct device_node *port) > { > @@ -57,7 +56,6 @@ u32 dss_of_port_get_port_number(struct device_node *port) > > return reg; > } > -EXPORT_SYMBOL_GPL(dss_of_port_get_port_number); > > struct omap_dss_device * > omapdss_of_find_source_for_first_ep(struct device_node *node) > diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c > index 3c572b699ed3..a84ab0337a91 100644 > --- a/drivers/gpu/drm/omapdrm/dss/output.c > +++ b/drivers/gpu/drm/omapdrm/dss/output.c > @@ -58,7 +58,6 @@ int omapdss_output_set_device(struct omap_dss_device *out, > > return r; > } > -EXPORT_SYMBOL(omapdss_output_set_device); > > int omapdss_output_unset_device(struct omap_dss_device *out) > { > @@ -92,7 +91,6 @@ int omapdss_output_unset_device(struct omap_dss_device *out) > > return r; > } > -EXPORT_SYMBOL(omapdss_output_unset_device); > > int omapdss_register_output(struct omap_dss_device *out) > { > @@ -118,7 +116,6 @@ bool omapdss_component_is_output(struct device_node *node) > > return false; > } > -EXPORT_SYMBOL(omapdss_component_is_output); > > struct omap_dss_device *omap_dss_get_output(enum omap_dss_output_id id) > { > @@ -131,7 +128,6 @@ struct omap_dss_device *omap_dss_get_output(enum omap_dss_output_id id) > > return NULL; > } > -EXPORT_SYMBOL(omap_dss_get_output); > > struct omap_dss_device *omap_dss_find_output_by_port_node(struct device_node *port) > { > @@ -156,7 +152,6 @@ struct omap_dss_device *omap_dss_find_output_by_port_node(struct device_node *po > > return NULL; > } > -EXPORT_SYMBOL(omap_dss_find_output_by_port_node); > > struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device *dssdev) > { > @@ -194,56 +189,47 @@ int dss_mgr_connect(enum omap_channel channel, > { > return dss_mgr_ops->connect(channel, dst); > } > -EXPORT_SYMBOL(dss_mgr_connect); > > void dss_mgr_disconnect(enum omap_channel channel, > struct omap_dss_device *dst) > { > dss_mgr_ops->disconnect(channel, dst); > } > -EXPORT_SYMBOL(dss_mgr_disconnect); > > void dss_mgr_set_timings(enum omap_channel channel, const struct videomode *vm) > { > dss_mgr_ops->set_timings(channel, vm); > } > -EXPORT_SYMBOL(dss_mgr_set_timings); > > void dss_mgr_set_lcd_config(enum omap_channel channel, > const struct dss_lcd_mgr_config *config) > { > dss_mgr_ops->set_lcd_config(channel, config); > } > -EXPORT_SYMBOL(dss_mgr_set_lcd_config); > > int dss_mgr_enable(enum omap_channel channel) > { > return dss_mgr_ops->enable(channel); > } > -EXPORT_SYMBOL(dss_mgr_enable); > > void dss_mgr_disable(enum omap_channel channel) > { > dss_mgr_ops->disable(channel); > } > -EXPORT_SYMBOL(dss_mgr_disable); > > void dss_mgr_start_update(enum omap_channel channel) > { > dss_mgr_ops->start_update(channel); > } > -EXPORT_SYMBOL(dss_mgr_start_update); > > int dss_mgr_register_framedone_handler(enum omap_channel channel, > void (*handler)(void *), void *data) > { > return dss_mgr_ops->register_framedone_handler(channel, handler, data); > } > -EXPORT_SYMBOL(dss_mgr_register_framedone_handler); > > void dss_mgr_unregister_framedone_handler(enum omap_channel channel, > void (*handler)(void *), void *data) > { > dss_mgr_ops->unregister_framedone_handler(channel, handler, data); > } > -EXPORT_SYMBOL(dss_mgr_unregister_framedone_handler); > -- > Regards, > > Laurent Pinchart > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Sebastian, On Saturday, 14 October 2017 15:22:00 EEST Sebastian Reichel wrote: > On Fri, Oct 13, 2017 at 05:59:00PM +0300, Laurent Pinchart wrote: > > There's no need for the omapdss-base code to be part of a separate > > module. Merge it with the omapdss module. This allows removing the > > exports for internal symbols. > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > > > drivers/gpu/drm/omapdrm/dss/Kconfig | 4 ---- > > drivers/gpu/drm/omapdrm/dss/Makefile | 19 +++++++++++++------ > > drivers/gpu/drm/omapdrm/dss/base.c | 7 ------- > > drivers/gpu/drm/omapdrm/dss/display.c | 2 -- > > drivers/gpu/drm/omapdrm/dss/dss-of.c | 2 -- > > drivers/gpu/drm/omapdrm/dss/output.c | 14 -------------- > > 6 files changed, 13 insertions(+), 35 deletions(-) [snip] > > diff --git a/drivers/gpu/drm/omapdrm/dss/Makefile > > b/drivers/gpu/drm/omapdrm/dss/Makefile index 3c5644c3fc38..531b4d8075e5 > > 100644 > > --- a/drivers/gpu/drm/omapdrm/dss/Makefile > > +++ b/drivers/gpu/drm/omapdrm/dss/Makefile > > @@ -1,12 +1,19 @@ > > obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o > > - > > -obj-$(CONFIG_OMAP_DSS_BASE) += omapdss-base.o > > -omapdss-base-y := base.o display.o dss-of.o output.o > > - > > obj-$(CONFIG_OMAP2_DSS) += omapdss.o > > + > > # Core DSS files > > -omapdss-y := core.o dss.o dispc.o dispc_coefs.o \ > > - pll.o video-pll.o > > +omapdss-y := \ > > + base.o \ > > + display.o \ > > + dss-of.o \ > > + output.o \ > > + core.o \ > > + dss.o \ > > + dispc.o \ > > + dispc_coefs.o \ > > + pll.o \ > > + video-pll.o > > + > > I guess it makes sense to sort this alphabetically, otherwise: Good point. I'll do that in v2, and will also sort the entries below. > Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> > > -- Sebastian > > > omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o > > omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o > > omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o [snip]
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki On 13/10/17 17:59, Laurent Pinchart wrote: > There's no need for the omapdss-base code to be part of a separate > module. Merge it with the omapdss module. This allows removing the > exports for internal symbols. The need was to support DSS6 driver, which is built as separate module. That's not in the mainline yet. If we merge dss6 driver into the same omapdrm.ko, then there should be no issues. Tomi
Hi Tomi, On Wednesday, 18 October 2017 12:19:26 EEST Tomi Valkeinen wrote: > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki > On 13/10/17 17:59, Laurent Pinchart wrote: > > There's no need for the omapdss-base code to be part of a separate > > module. Merge it with the omapdss module. This allows removing the > > exports for internal symbols. > > The need was to support DSS6 driver, which is built as separate module. > That's not in the mainline yet. > > If we merge dss6 driver into the same omapdrm.ko, then there should be > no issues. As this series merges omapdrm and omapdss I think it would make sense to support DSS[2-5] and DSS6 in the same module (probably with a Kconfig option to select which variant(s) to support).
diff --git a/drivers/gpu/drm/omapdrm/dss/Kconfig b/drivers/gpu/drm/omapdrm/dss/Kconfig index f24ebf7f61dd..39a30a64448a 100644 --- a/drivers/gpu/drm/omapdrm/dss/Kconfig +++ b/drivers/gpu/drm/omapdrm/dss/Kconfig @@ -1,12 +1,8 @@ config OMAP2_DSS_INIT bool -config OMAP_DSS_BASE - tristate - menuconfig OMAP2_DSS tristate "OMAP2+ Display Subsystem support" - select OMAP_DSS_BASE select VIDEOMODE_HELPERS select OMAP2_DSS_INIT select HDMI diff --git a/drivers/gpu/drm/omapdrm/dss/Makefile b/drivers/gpu/drm/omapdrm/dss/Makefile index 3c5644c3fc38..531b4d8075e5 100644 --- a/drivers/gpu/drm/omapdrm/dss/Makefile +++ b/drivers/gpu/drm/omapdrm/dss/Makefile @@ -1,12 +1,19 @@ obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o - -obj-$(CONFIG_OMAP_DSS_BASE) += omapdss-base.o -omapdss-base-y := base.o display.o dss-of.o output.o - obj-$(CONFIG_OMAP2_DSS) += omapdss.o + # Core DSS files -omapdss-y := core.o dss.o dispc.o dispc_coefs.o \ - pll.o video-pll.o +omapdss-y := \ + base.o \ + display.o \ + dss-of.o \ + output.o \ + core.o \ + dss.o \ + dispc.o \ + dispc_coefs.o \ + pll.o \ + video-pll.o + omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o diff --git a/drivers/gpu/drm/omapdrm/dss/base.c b/drivers/gpu/drm/omapdrm/dss/base.c index 13e91faaf7a6..eff427dd3297 100644 --- a/drivers/gpu/drm/omapdrm/dss/base.c +++ b/drivers/gpu/drm/omapdrm/dss/base.c @@ -20,7 +20,6 @@ void omapdss_set_is_initialized(bool set) { dss_initialized = set; } -EXPORT_SYMBOL(omapdss_set_is_initialized); bool omapdss_is_initialized(void) { @@ -32,7 +31,6 @@ void dispc_set_ops(const struct dispc_ops *o) { ops = o; } -EXPORT_SYMBOL(dispc_set_ops); const struct dispc_ops *dispc_get_ops(void) { @@ -108,7 +106,6 @@ void omapdss_gather_components(struct device *dev) omapdss_walk_device(dev, child, true); } } -EXPORT_SYMBOL(omapdss_gather_components); static bool omapdss_component_is_loaded(struct omapdss_comp_node *comp) { @@ -134,7 +131,3 @@ bool omapdss_stack_is_ready(void) return true; } EXPORT_SYMBOL(omapdss_stack_is_ready); - -MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>"); -MODULE_DESCRIPTION("OMAP Display Subsystem Base"); -MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/omapdrm/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c index 8c77a2d20969..a86471f73094 100644 --- a/drivers/gpu/drm/omapdrm/dss/display.c +++ b/drivers/gpu/drm/omapdrm/dss/display.c @@ -35,7 +35,6 @@ void omapdss_default_get_timings(struct omap_dss_device *dssdev, { *vm = dssdev->panel.vm; } -EXPORT_SYMBOL(omapdss_default_get_timings); static LIST_HEAD(panel_list); static DEFINE_MUTEX(panel_list_mutex); @@ -104,7 +103,6 @@ bool omapdss_component_is_display(struct device_node *node) mutex_unlock(&panel_list_mutex); return found; } -EXPORT_SYMBOL(omapdss_component_is_display); struct omap_dss_device *omap_dss_get_device(struct omap_dss_device *dssdev) { diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c index c6b86f348a5c..d3a19a5dfd35 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss-of.c +++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c @@ -44,7 +44,6 @@ struct device_node *dss_of_port_get_parent_device(struct device_node *port) return NULL; } -EXPORT_SYMBOL_GPL(dss_of_port_get_parent_device); u32 dss_of_port_get_port_number(struct device_node *port) { @@ -57,7 +56,6 @@ u32 dss_of_port_get_port_number(struct device_node *port) return reg; } -EXPORT_SYMBOL_GPL(dss_of_port_get_port_number); struct omap_dss_device * omapdss_of_find_source_for_first_ep(struct device_node *node) diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c index 3c572b699ed3..a84ab0337a91 100644 --- a/drivers/gpu/drm/omapdrm/dss/output.c +++ b/drivers/gpu/drm/omapdrm/dss/output.c @@ -58,7 +58,6 @@ int omapdss_output_set_device(struct omap_dss_device *out, return r; } -EXPORT_SYMBOL(omapdss_output_set_device); int omapdss_output_unset_device(struct omap_dss_device *out) { @@ -92,7 +91,6 @@ int omapdss_output_unset_device(struct omap_dss_device *out) return r; } -EXPORT_SYMBOL(omapdss_output_unset_device); int omapdss_register_output(struct omap_dss_device *out) { @@ -118,7 +116,6 @@ bool omapdss_component_is_output(struct device_node *node) return false; } -EXPORT_SYMBOL(omapdss_component_is_output); struct omap_dss_device *omap_dss_get_output(enum omap_dss_output_id id) { @@ -131,7 +128,6 @@ struct omap_dss_device *omap_dss_get_output(enum omap_dss_output_id id) return NULL; } -EXPORT_SYMBOL(omap_dss_get_output); struct omap_dss_device *omap_dss_find_output_by_port_node(struct device_node *port) { @@ -156,7 +152,6 @@ struct omap_dss_device *omap_dss_find_output_by_port_node(struct device_node *po return NULL; } -EXPORT_SYMBOL(omap_dss_find_output_by_port_node); struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device *dssdev) { @@ -194,56 +189,47 @@ int dss_mgr_connect(enum omap_channel channel, { return dss_mgr_ops->connect(channel, dst); } -EXPORT_SYMBOL(dss_mgr_connect); void dss_mgr_disconnect(enum omap_channel channel, struct omap_dss_device *dst) { dss_mgr_ops->disconnect(channel, dst); } -EXPORT_SYMBOL(dss_mgr_disconnect); void dss_mgr_set_timings(enum omap_channel channel, const struct videomode *vm) { dss_mgr_ops->set_timings(channel, vm); } -EXPORT_SYMBOL(dss_mgr_set_timings); void dss_mgr_set_lcd_config(enum omap_channel channel, const struct dss_lcd_mgr_config *config) { dss_mgr_ops->set_lcd_config(channel, config); } -EXPORT_SYMBOL(dss_mgr_set_lcd_config); int dss_mgr_enable(enum omap_channel channel) { return dss_mgr_ops->enable(channel); } -EXPORT_SYMBOL(dss_mgr_enable); void dss_mgr_disable(enum omap_channel channel) { dss_mgr_ops->disable(channel); } -EXPORT_SYMBOL(dss_mgr_disable); void dss_mgr_start_update(enum omap_channel channel) { dss_mgr_ops->start_update(channel); } -EXPORT_SYMBOL(dss_mgr_start_update); int dss_mgr_register_framedone_handler(enum omap_channel channel, void (*handler)(void *), void *data) { return dss_mgr_ops->register_framedone_handler(channel, handler, data); } -EXPORT_SYMBOL(dss_mgr_register_framedone_handler); void dss_mgr_unregister_framedone_handler(enum omap_channel channel, void (*handler)(void *), void *data) { dss_mgr_ops->unregister_framedone_handler(channel, handler, data); } -EXPORT_SYMBOL(dss_mgr_unregister_framedone_handler);
There's no need for the omapdss-base code to be part of a separate module. Merge it with the omapdss module. This allows removing the exports for internal symbols. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/gpu/drm/omapdrm/dss/Kconfig | 4 ---- drivers/gpu/drm/omapdrm/dss/Makefile | 19 +++++++++++++------ drivers/gpu/drm/omapdrm/dss/base.c | 7 ------- drivers/gpu/drm/omapdrm/dss/display.c | 2 -- drivers/gpu/drm/omapdrm/dss/dss-of.c | 2 -- drivers/gpu/drm/omapdrm/dss/output.c | 14 -------------- 6 files changed, 13 insertions(+), 35 deletions(-)