[PATCH] drm/sun4i: use sun4i_tcon_of_table to check if a device node is a TCON

[Maxime Ripard]

On Wed, Nov 29, 2017 at 11:43:14AM +0800, Chen-Yu Tsai wrote:
> On Tue, Nov 28, 2017 at 6:01 PM, Maxime Ripard
> <maxime.ripard at free-electrons.com> wrote:
> > Hi,
> >
> > On Mon, Nov 27, 2017 at 04:46:32PM +0800, Chen-Yu Tsai wrote:
> >> The sun4i DRM driver maintains a list of compatible strings it uses to
> >> check if a device node within the display component graph is a TCON.
> >> The TCON driver also has this list, used to bind the TCON driver to
> >> the device. These two lists are identical.
> >>
> >> Instead of maintaining two identical lists, export the list from the
> >> TCON driver for the DRM driver to use.
> >>
> >> Suggested-by: Rob Herring <robh at kernel.org>
> >> Signed-off-by: Chen-Yu Tsai <wens at csie.org>
> >> ---
> >>  drivers/gpu/drm/sun4i/sun4i_drv.c  | 8 +-------
> >>  drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +++-
> >>  drivers/gpu/drm/sun4i/sun4i_tcon.h | 2 ++
> >>  3 files changed, 6 insertions(+), 8 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
> >> index 75c76cdd82bc..49215d91c853 100644
> >> --- a/drivers/gpu/drm/sun4i/sun4i_drv.c
> >> +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
> >> @@ -187,13 +187,7 @@ static bool sun4i_drv_node_is_frontend(struct device_node *node)
> >>
> >>  static bool sun4i_drv_node_is_tcon(struct device_node *node)
> >>  {
> >> -     return of_device_is_compatible(node, "allwinner,sun4i-a10-tcon") ||
> >> -             of_device_is_compatible(node, "allwinner,sun5i-a13-tcon") ||
> >> -             of_device_is_compatible(node, "allwinner,sun6i-a31-tcon") ||
> >> -             of_device_is_compatible(node, "allwinner,sun6i-a31s-tcon") ||
> >> -             of_device_is_compatible(node, "allwinner,sun7i-a20-tcon") ||
> >> -             of_device_is_compatible(node, "allwinner,sun8i-a33-tcon") ||
> >> -             of_device_is_compatible(node, "allwinner,sun8i-v3s-tcon");
> >> +     return !!of_match_node(sun4i_tcon_of_table, node);
> >>  }
> >>
> >>  static int compare_of(struct device *dev, void *data)
> >> diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
> >> index e122f5b2a395..a1ed462c2430 100644
> >> --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
> >> +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
> >> @@ -900,7 +900,8 @@ static const struct sun4i_tcon_quirks sun8i_v3s_quirks = {
> >>       /* nothing is supported */
> >>  };
> >>
> >> -static const struct of_device_id sun4i_tcon_of_table[] = {
> >> +/* sun4i_drv uses this list to check if a device node is a TCON */
> >> +const struct of_device_id sun4i_tcon_of_table[] = {
> >>       { .compatible = "allwinner,sun4i-a10-tcon", .data = &sun4i_a10_quirks },
> >>       { .compatible = "allwinner,sun5i-a13-tcon", .data = &sun5i_a13_quirks },
> >>       { .compatible = "allwinner,sun6i-a31-tcon", .data = &sun6i_a31_quirks },
> >> @@ -911,6 +912,7 @@ static const struct of_device_id sun4i_tcon_of_table[] = {
> >>       { }
> >>  };
> >>  MODULE_DEVICE_TABLE(of, sun4i_tcon_of_table);
> >> +EXPORT_SYMBOL(sun4i_tcon_of_table);
> >>
> >>  static struct platform_driver sun4i_tcon_platform_driver = {
> >>       .probe          = sun4i_tcon_probe,
> >> diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.h b/drivers/gpu/drm/sun4i/sun4i_tcon.h
> >> index f61bf6d83b4a..839266a38505 100644
> >> --- a/drivers/gpu/drm/sun4i/sun4i_tcon.h
> >> +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h
> >> @@ -197,4 +197,6 @@ void sun4i_tcon_mode_set(struct sun4i_tcon *tcon,
> >>  void sun4i_tcon_set_status(struct sun4i_tcon *crtc,
> >>                          const struct drm_encoder *encoder, bool enable);
> >>
> >> +extern const struct of_device_id sun4i_tcon_of_table[];
> >> +
> >
> > I'm not very fond of that approach. Maybe we can place the structure
> > in the tcon header?
> 
> Doesn't that mean you get one copy of everything wherever they are referenced?
> This is assuming the compiler trims unused ones from files that include the
> header file.

Indeed. I've applied this patch, thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20171130/8b311f5a/attachment.sig>