[PATCH 3/3] drm: pl111: Move VExpress setup into versatile init
Rob Herring
robh at kernel.org
Fri Apr 17 17:33:29 UTC 2020
On Thu, Apr 9, 2020 at 9:34 AM Sam Ravnborg <sam at ravnborg.org> wrote:
>
> Hi Rob.
>
> On Wed, Apr 08, 2020 at 07:39:47PM -0600, Rob Herring wrote:
> > Since the VExpress setup in pl111_vexpress.c is now just a single
> > function call, let's move it into pl111_versatile.c and we can further
> > simplify pl111_versatile_init() by moving the other pieces for VExpress
> > into pl111_vexpress_clcd_init().
> >
> > Cc: Eric Anholt <eric at anholt.net>
> > Cc: dri-devel at lists.freedesktop.org
> > Signed-off-by: Rob Herring <robh at kernel.org>
> Patch looks good - nits below, but anyway:
>
> Acked-by: Sam Ravnborg <sam at ravnborg.org>
>
>
> > ---
> > drivers/gpu/drm/pl111/Makefile | 1 -
> > drivers/gpu/drm/pl111/pl111_versatile.c | 122 ++++++++++++++++++++----
> > drivers/gpu/drm/pl111/pl111_vexpress.c | 96 -------------------
> > drivers/gpu/drm/pl111/pl111_vexpress.h | 22 -----
> > 4 files changed, 102 insertions(+), 139 deletions(-)
> > delete mode 100644 drivers/gpu/drm/pl111/pl111_vexpress.c
> > delete mode 100644 drivers/gpu/drm/pl111/pl111_vexpress.h
> >
> > diff --git a/drivers/gpu/drm/pl111/Makefile b/drivers/gpu/drm/pl111/Makefile
> > index 0c70f0e91d21..67d430d433e0 100644
> > --- a/drivers/gpu/drm/pl111/Makefile
> > +++ b/drivers/gpu/drm/pl111/Makefile
> > @@ -3,7 +3,6 @@ pl111_drm-y += pl111_display.o \
> > pl111_versatile.o \
> > pl111_drv.o
> >
> > -pl111_drm-$(CONFIG_ARCH_VEXPRESS) += pl111_vexpress.o
> > pl111_drm-$(CONFIG_ARCH_NOMADIK) += pl111_nomadik.o
> > pl111_drm-$(CONFIG_DEBUG_FS) += pl111_debugfs.o
> >
> > diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c
> > index 8c2551088f26..1b55f977e945 100644
> > --- a/drivers/gpu/drm/pl111/pl111_versatile.c
> > +++ b/drivers/gpu/drm/pl111/pl111_versatile.c
> > @@ -11,7 +11,6 @@
> > #include <linux/vexpress.h>
> >
> > #include "pl111_versatile.h"
> > -#include "pl111_vexpress.h"
> > #include "pl111_drm.h"
> >
> > static struct regmap *versatile_syscon_map;
> > @@ -309,13 +308,110 @@ static const struct pl111_variant_data pl111_vexpress = {
> > .broken_clockdivider = true,
> > };
> >
> > +#define VEXPRESS_FPGAMUX_MOTHERBOARD 0x00
> > +#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_1 0x01
> > +#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_2 0x02
> > +
> > +static int pl111_vexpress_clcd_init(struct device *dev, struct device_node *np,
> > + struct pl111_drm_dev_private *priv)
> > +{
> > + struct platform_device *pdev;
> > + struct device_node *root;
> > + struct device_node *child;
> > + struct device_node *ct_clcd = NULL;
> > + struct regmap *map;
> > + bool has_coretile_clcd = false;
> > + bool has_coretile_hdlcd = false;
> > + bool mux_motherboard = true;
> > + u32 val;
> > + int ret;
> > +
> > + if (!IS_ENABLED(CONFIG_VEXPRESS_CONFIG))
> > + return -ENODEV;
> Thats was a simple way to get out of this.
> Maybe a WARN() was in place, because should we ever hit this?
We didn't warn before if misconfigured. Adding an error print at the
caller should be enough.
> > +
> > + /*
> > + * Check if we have a CLCD or HDLCD on the core tile by checking if a
> > + * CLCD or HDLCD is available in the root of the device tree.
> > + */
> > + root = of_find_node_by_path("/");
> > + if (!root)
> > + return -EINVAL;
> > +
> > + for_each_available_child_of_node(root, child) {
> > + if (of_device_is_compatible(child, "arm,pl111")) {
> > + has_coretile_clcd = true;
> > + ct_clcd = child;
> > + break;
> > + }
> > + if (of_device_is_compatible(child, "arm,hdlcd")) {
> > + has_coretile_hdlcd = true;
> > + of_node_put(child);
> > + break;
> > + }
> > + }
> > +
> > + of_node_put(root);
> > +
> > + /*
> > + * If there is a coretile HDLCD and it has a driver,
> > + * do not mux the CLCD on the motherboard to the DVI.
> > + */
> > + if (has_coretile_hdlcd && IS_ENABLED(CONFIG_DRM_HDLCD))
> > + mux_motherboard = false;
> > +
> > + /*
> > + * On the Vexpress CA9 we let the CLCD on the coretile
> > + * take precedence, so also in this case do not mux the
> > + * motherboard to the DVI.
> > + */
> > + if (has_coretile_clcd)
> > + mux_motherboard = false;
> > +
> > + if (mux_motherboard) {
> > + dev_info(dev, "DVI muxed to motherboard CLCD\n");
> > + val = VEXPRESS_FPGAMUX_MOTHERBOARD;
> > + } else if (ct_clcd == dev->of_node) {
> > + dev_info(dev,
> > + "DVI muxed to daughterboard 1 (core tile) CLCD\n");
> > + val = VEXPRESS_FPGAMUX_DAUGHTERBOARD_1;
> > + } else {
> > + dev_info(dev, "core tile graphics present\n");
> > + dev_info(dev, "this device will be deactivated\n");
> > + return -ENODEV;
> > + }
> > +
> > + /* Call into deep Vexpress configuration API */
> > + pdev = of_find_device_by_node(np);
> > + if (!pdev) {
> > + dev_err(dev, "can't find the sysreg device, deferring\n");
> > + return -EPROBE_DEFER;
> > + }
> > +
> > + map = devm_regmap_init_vexpress_config(&pdev->dev);
> > + if (IS_ERR(map)) {
> > + platform_device_put(pdev);
> > + return PTR_ERR(map);
> > + }
> > +
> > + ret = regmap_write(map, 0, val);
> > + platform_device_put(pdev);
> > + if (ret) {
> > + dev_err(dev, "error setting DVI muxmode\n");
> > + return -ENODEV;
> > + }
> > +
> > + priv->variant = &pl111_vexpress;
> > + dev_info(dev, "initializing Versatile Express PL111\n");
> > +
> > + return 0;
> > +}
> > +
> > int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
> > {
> > const struct of_device_id *clcd_id;
> > enum versatile_clcd versatile_clcd_type;
> > struct device_node *np;
> > struct regmap *map;
> > - int ret;
> >
> > np = of_find_matching_node_and_match(NULL, versatile_clcd_of_match,
> > &clcd_id);
> > @@ -326,17 +422,10 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
> > versatile_clcd_type = (enum versatile_clcd)clcd_id->data;
> >
> > /* Versatile Express special handling */
> > - if (IS_ENABLED(CONFIG_VEXPRESS_CONFIG) && versatile_clcd_type == VEXPRESS_CLCD_V2M) {
> > - struct platform_device *pdev;
> > - /* Call into deep Vexpress configuration API */
> > - pdev = of_find_device_by_node(np);
> > - if (!pdev) {
> > - dev_err(dev, "can't find the sysreg device, deferring\n");
> > - of_node_put(np);
> > - return -EPROBE_DEFER;
> > - }
> > - map = devm_regmap_init_vexpress_config(&pdev->dev);
> > - platform_device_put(pdev);
> > + if (versatile_clcd_type == VEXPRESS_CLCD_V2M) {
> > + int ret = pl111_vexpress_clcd_init(dev, np, priv);
> > + of_node_put(np);
> > + return ret;
> It is often in error situations one return early, but in this case it is
> a normal case. Maybe a small comment?
I'm adding a print here to address your other comments and I think
that should be sufficient. I'll also move this up so the Vexpress
handling is before everything else.
>
>
> > } else {
And I don't need this else.
> > map = syscon_node_to_regmap(np);
> > }
> > @@ -380,13 +469,6 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
> > priv->variant_display_disable = pl111_realview_clcd_disable;
> > dev_info(dev, "set up callbacks for RealView PL111\n");
> > break;
> > - case VEXPRESS_CLCD_V2M:
> > - priv->variant = &pl111_vexpress;
> > - dev_info(dev, "initializing Versatile Express PL111\n");
> > - ret = pl111_vexpress_clcd_init(dev, priv, map);
> > - if (ret)
> > - return ret;
> > - break;
>
> The switch no longer includes VEXPRESS_CLCD_V2M - because we will never
> reach the switch in this case.
> I guess some gcc falgs may cause a warning that not all enums are
> accounted for. But then again, the default may supress it.
Yes, default suppresses that.
Rob
More information about the dri-devel
mailing list