From mboxrd@z Thu Jan 1 00:00:00 1970 From: eric@anholt.net (Eric Anholt) Date: Sat, 07 Apr 2018 18:16:29 -0700 Subject: [PATCH 1/2 v2] drm/pl111: Support the Versatile Express In-Reply-To: <20180406141935.6801-1-linus.walleij@linaro.org> References: <20180406141935.6801-1-linus.walleij@linaro.org> Message-ID: <87d0zao5ua.fsf@anholt.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Linus Walleij writes: > The Versatile Express uses a special configuration controller > deeply embedded in the system motherboard FPGA to multiplex the > two to three (!) CLCD instances out to the single SiI9022 > bridge. > > Set up an extra file with the logic to probe to the FPGA mux > register on the system controller bus, then parse the memory > range argument to figure out what path the CLCD signal is > actually taking, and set up the mux accordingly. > > If there is a CLCD instance on the core tile (the daughterboard > with the CPUs fitted) then that CLCD instance will take > precedence since it can address all memory. > > Scale down the Versatile Express to 16BPP so we can support a > 1024x768 display despite the bus bandwidth restrictions on this > platform. > > Cc: Liviu Dudau > Cc: Pawel Moll > Signed-off-by: Linus Walleij > --- > ChangeLog v1->v2: > - No changes just reposting rebased on mainline changes. > --- > drivers/gpu/drm/pl111/Makefile | 1 + > drivers/gpu/drm/pl111/pl111_drm.h | 3 +- > drivers/gpu/drm/pl111/pl111_versatile.c | 48 ++++++++++++++- > drivers/gpu/drm/pl111/pl111_vexpress.c | 106 ++++++++++++++++++++++++++++++++ > drivers/gpu/drm/pl111/pl111_vexpress.h | 22 +++++++ > 5 files changed, 178 insertions(+), 2 deletions(-) > create mode 100644 drivers/gpu/drm/pl111/pl111_vexpress.c > create mode 100644 drivers/gpu/drm/pl111/pl111_vexpress.h > > diff --git a/drivers/gpu/drm/pl111/Makefile b/drivers/gpu/drm/pl111/Makefile > index 9c5e8dba8ac6..19a8189dc54f 100644 > --- a/drivers/gpu/drm/pl111/Makefile > +++ b/drivers/gpu/drm/pl111/Makefile > @@ -3,6 +3,7 @@ pl111_drm-y += pl111_display.o \ > pl111_versatile.o \ > pl111_drv.o > > +pl111_drm-$(CONFIG_ARCH_VEXPRESS) += pl111_vexpress.o > pl111_drm-$(CONFIG_DEBUG_FS) += pl111_debugfs.o > > obj-$(CONFIG_DRM_PL111) += pl111_drm.o > diff --git a/drivers/gpu/drm/pl111/pl111_drm.h b/drivers/gpu/drm/pl111/pl111_drm.h > index 8639b2d4ddf7..916154ac733a 100644 > --- a/drivers/gpu/drm/pl111/pl111_drm.h > +++ b/drivers/gpu/drm/pl111/pl111_drm.h > @@ -64,7 +64,8 @@ struct pl111_drm_dev_private { > struct drm_bridge *bridge; > struct drm_simple_display_pipe pipe; > > - void *regs; > + void __iomem *clcd_memory; This doesn't seem to be used anywhere. > diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c > index 9302f516045e..569edf02a36a 100644 > --- a/drivers/gpu/drm/pl111/pl111_versatile.c > +++ b/drivers/gpu/drm/pl111/pl111_versatile.c > @@ -1,12 +1,14 @@ > #include > #include > #include > +#include > #include > #include > #include > #include > #include > #include "pl111_versatile.h" > +#include "pl111_vexpress.h" > #include "pl111_drm.h" > > static struct regmap *versatile_syscon_map; > @@ -22,6 +24,7 @@ enum versatile_clcd { > REALVIEW_CLCD_PB11MP, > REALVIEW_CLCD_PBA8, > REALVIEW_CLCD_PBX, > + VEXPRESS_CLCD_V2M, > }; > > static const struct of_device_id versatile_clcd_of_match[] = { > @@ -53,6 +56,10 @@ static const struct of_device_id versatile_clcd_of_match[] = { > .compatible = "arm,realview-pbx-syscon", > .data = (void *)REALVIEW_CLCD_PBX, > }, > + { > + .compatible = "arm,vexpress-muxfpga", > + .data = (void *)VEXPRESS_CLCD_V2M, > + }, > {}, > }; > > @@ -286,12 +293,26 @@ static const struct pl111_variant_data pl111_realview = { > .fb_bpp = 16, > }; > > +/* > + * Versatile Express PL111 variant, again we just push the maximum > + * BPP to 16 to be able to get 1024x768 without saturating the memory > + * bus. The clockdivider also seems broken on the Versatile Express. > + */ > +static const struct pl111_variant_data pl111_vexpress = { > + .name = "PL111 Versatile Express", > + .formats = pl111_realview_pixel_formats, > + .nformats = ARRAY_SIZE(pl111_realview_pixel_formats), > + .fb_bpp = 16, > + .broken_clockdivider = true, > +}; > + > 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); > @@ -301,7 +322,25 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv) > } > versatile_clcd_type = (enum versatile_clcd)clcd_id->data; > > - map = syscon_node_to_regmap(np); > + /* Versatile Express special handling */ > + if (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"); > + return -EPROBE_DEFER; > + } > + map = dev_get_drvdata(&pdev->dev); > + if (!map) { > + dev_err(dev, "sysreg has not yet probed\n"); > + return -EPROBE_DEFER; > + } > + } else { > + map = syscon_node_to_regmap(np); > + } > + > if (IS_ERR(map)) { > dev_err(dev, "no Versatile syscon regmap\n"); > return PTR_ERR(map); > @@ -340,6 +379,13 @@ 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; > default: > dev_info(dev, "unknown Versatile system controller\n"); > break; > diff --git a/drivers/gpu/drm/pl111/pl111_vexpress.c b/drivers/gpu/drm/pl111/pl111_vexpress.c > new file mode 100644 > index 000000000000..720244f497fe > --- /dev/null > +++ b/drivers/gpu/drm/pl111/pl111_vexpress.c > @@ -0,0 +1,106 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Versatile Express PL111 handling > + * Copyright (C) 2018 Linus Walleij > + * > + * This module binds to the "arm,vexpress-muxfpga" device on the > + * Versatile Express configuration bus and sets up which CLCD instance > + * gets muxed out on the DVI bridge. > + */ > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include "pl111_drm.h" > +#include "pl111_vexpress.h" > + > +#define VEXPRESS_FPGAMUX_MOTHERBOARD 0x00 > +#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_1 0x01 > +#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_2 0x02 > + > +static bool daughterboard_muxed = false; > +static bool motherboard_muxed = false; > + > +int pl111_vexpress_clcd_init(struct device *dev, > + struct pl111_drm_dev_private *priv, > + struct regmap *map) > +{ > + struct device_node *memory; > + u32 val; > + int ret; > + > + /* > + * The CLCD on the motherboard has a special memory region and > + * does not make use of CMA. We differentiate between the different > + * CLCD controllers using this memory region phandle. > + */ > + memory = of_parse_phandle(dev->of_node, "memory-region", 0); > + if (!memory) { > + if (motherboard_muxed) { > + dev_info(dev, "motherboard CLCD muxed in\n"); > + dev_info(dev, "daughterboard takes precedence\n"); > + dev_info(dev, "motherboard CLCD will not be muxed out\n"); > + } > + dev_info(dev, > + "DVI muxed to daughterboard 1 (core tile) CLCD\n"); > + val = VEXPRESS_FPGAMUX_DAUGHTERBOARD_1; > + daughterboard_muxed = true; > + } else { > + priv->clcd_memory = of_iomap(memory, 0); > + if (!priv->clcd_memory) > + dev_err(dev, "could not remap CLCD memory\n"); > + /* Fall through and try to use CMA */ > + if (daughterboard_muxed) { > + dev_info(dev, "daughterboard takes precedence\n"); > + dev_info(dev, "motherboard CLCD will not be muxed out\n"); > + return -ENODEV; > + } > + dev_info(dev, "DVI muxed to motherboard CLCD\n"); > + val = VEXPRESS_FPGAMUX_MOTHERBOARD; > + motherboard_muxed = true; > + } I'm confused by global bools here. It seems like we're trying to coordinate between the instantiation of multiple CLCDs here, to set up the mux appropriately. Does it make sense to do things that way, if probe order is unreliable? -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 832 bytes Desc: not available URL: From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Anholt Subject: Re: [PATCH 1/2 v2] drm/pl111: Support the Versatile Express Date: Sat, 07 Apr 2018 18:16:29 -0700 Message-ID: <87d0zao5ua.fsf@anholt.net> References: <20180406141935.6801-1-linus.walleij@linaro.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0925522337==" Return-path: Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id 694026E178 for ; Sun, 8 Apr 2018 01:16:33 +0000 (UTC) In-Reply-To: <20180406141935.6801-1-linus.walleij@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Linus Walleij , Daniel Vetter , Jani Nikula , Sean Paul , Liviu Dudau Cc: Pawel Moll , linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============0925522337== Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Linus Walleij writes: > The Versatile Express uses a special configuration controller > deeply embedded in the system motherboard FPGA to multiplex the > two to three (!) CLCD instances out to the single SiI9022 > bridge. > > Set up an extra file with the logic to probe to the FPGA mux > register on the system controller bus, then parse the memory > range argument to figure out what path the CLCD signal is > actually taking, and set up the mux accordingly. > > If there is a CLCD instance on the core tile (the daughterboard > with the CPUs fitted) then that CLCD instance will take > precedence since it can address all memory. > > Scale down the Versatile Express to 16BPP so we can support a > 1024x768 display despite the bus bandwidth restrictions on this > platform. > > Cc: Liviu Dudau > Cc: Pawel Moll > Signed-off-by: Linus Walleij > --- > ChangeLog v1->v2: > - No changes just reposting rebased on mainline changes. > --- > drivers/gpu/drm/pl111/Makefile | 1 + > drivers/gpu/drm/pl111/pl111_drm.h | 3 +- > drivers/gpu/drm/pl111/pl111_versatile.c | 48 ++++++++++++++- > drivers/gpu/drm/pl111/pl111_vexpress.c | 106 ++++++++++++++++++++++++++= ++++++ > drivers/gpu/drm/pl111/pl111_vexpress.h | 22 +++++++ > 5 files changed, 178 insertions(+), 2 deletions(-) > create mode 100644 drivers/gpu/drm/pl111/pl111_vexpress.c > create mode 100644 drivers/gpu/drm/pl111/pl111_vexpress.h > > diff --git a/drivers/gpu/drm/pl111/Makefile b/drivers/gpu/drm/pl111/Makef= ile > index 9c5e8dba8ac6..19a8189dc54f 100644 > --- a/drivers/gpu/drm/pl111/Makefile > +++ b/drivers/gpu/drm/pl111/Makefile > @@ -3,6 +3,7 @@ pl111_drm-y +=3D pl111_display.o \ > pl111_versatile.o \ > pl111_drv.o >=20=20 > +pl111_drm-$(CONFIG_ARCH_VEXPRESS) +=3D pl111_vexpress.o > pl111_drm-$(CONFIG_DEBUG_FS) +=3D pl111_debugfs.o >=20=20 > obj-$(CONFIG_DRM_PL111) +=3D pl111_drm.o > diff --git a/drivers/gpu/drm/pl111/pl111_drm.h b/drivers/gpu/drm/pl111/pl= 111_drm.h > index 8639b2d4ddf7..916154ac733a 100644 > --- a/drivers/gpu/drm/pl111/pl111_drm.h > +++ b/drivers/gpu/drm/pl111/pl111_drm.h > @@ -64,7 +64,8 @@ struct pl111_drm_dev_private { > struct drm_bridge *bridge; > struct drm_simple_display_pipe pipe; >=20=20 > - void *regs; > + void __iomem *clcd_memory; This doesn't seem to be used anywhere. > diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl= 111/pl111_versatile.c > index 9302f516045e..569edf02a36a 100644 > --- a/drivers/gpu/drm/pl111/pl111_versatile.c > +++ b/drivers/gpu/drm/pl111/pl111_versatile.c > @@ -1,12 +1,14 @@ > #include > #include > #include > +#include > #include > #include > #include > #include > #include > #include "pl111_versatile.h" > +#include "pl111_vexpress.h" > #include "pl111_drm.h" >=20=20 > static struct regmap *versatile_syscon_map; > @@ -22,6 +24,7 @@ enum versatile_clcd { > REALVIEW_CLCD_PB11MP, > REALVIEW_CLCD_PBA8, > REALVIEW_CLCD_PBX, > + VEXPRESS_CLCD_V2M, > }; >=20=20 > static const struct of_device_id versatile_clcd_of_match[] =3D { > @@ -53,6 +56,10 @@ static const struct of_device_id versatile_clcd_of_mat= ch[] =3D { > .compatible =3D "arm,realview-pbx-syscon", > .data =3D (void *)REALVIEW_CLCD_PBX, > }, > + { > + .compatible =3D "arm,vexpress-muxfpga", > + .data =3D (void *)VEXPRESS_CLCD_V2M, > + }, > {}, > }; >=20=20 > @@ -286,12 +293,26 @@ static const struct pl111_variant_data pl111_realvi= ew =3D { > .fb_bpp =3D 16, > }; >=20=20 > +/* > + * Versatile Express PL111 variant, again we just push the maximum > + * BPP to 16 to be able to get 1024x768 without saturating the memory > + * bus. The clockdivider also seems broken on the Versatile Express. > + */ > +static const struct pl111_variant_data pl111_vexpress =3D { > + .name =3D "PL111 Versatile Express", > + .formats =3D pl111_realview_pixel_formats, > + .nformats =3D ARRAY_SIZE(pl111_realview_pixel_formats), > + .fb_bpp =3D 16, > + .broken_clockdivider =3D true, > +}; > + > int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_privat= e *priv) > { > const struct of_device_id *clcd_id; > enum versatile_clcd versatile_clcd_type; > struct device_node *np; > struct regmap *map; > + int ret; >=20=20 > np =3D of_find_matching_node_and_match(NULL, versatile_clcd_of_match, > &clcd_id); > @@ -301,7 +322,25 @@ int pl111_versatile_init(struct device *dev, struct = pl111_drm_dev_private *priv) > } > versatile_clcd_type =3D (enum versatile_clcd)clcd_id->data; >=20=20 > - map =3D syscon_node_to_regmap(np); > + /* Versatile Express special handling */ > + if (versatile_clcd_type =3D=3D VEXPRESS_CLCD_V2M) { > + struct platform_device *pdev; > + > + /* Call into deep Vexpress configuration API */ > + pdev =3D of_find_device_by_node(np); > + if (!pdev) { > + dev_err(dev, "can't find the sysreg device, deferring\n"); > + return -EPROBE_DEFER; > + } > + map =3D dev_get_drvdata(&pdev->dev); > + if (!map) { > + dev_err(dev, "sysreg has not yet probed\n"); > + return -EPROBE_DEFER; > + } > + } else { > + map =3D syscon_node_to_regmap(np); > + } > + > if (IS_ERR(map)) { > dev_err(dev, "no Versatile syscon regmap\n"); > return PTR_ERR(map); > @@ -340,6 +379,13 @@ int pl111_versatile_init(struct device *dev, struct = pl111_drm_dev_private *priv) > priv->variant_display_disable =3D pl111_realview_clcd_disable; > dev_info(dev, "set up callbacks for RealView PL111\n"); > break; > + case VEXPRESS_CLCD_V2M: > + priv->variant =3D &pl111_vexpress; > + dev_info(dev, "initializing Versatile Express PL111\n"); > + ret =3D pl111_vexpress_clcd_init(dev, priv, map); > + if (ret) > + return ret; > + break; > default: > dev_info(dev, "unknown Versatile system controller\n"); > break; > diff --git a/drivers/gpu/drm/pl111/pl111_vexpress.c b/drivers/gpu/drm/pl1= 11/pl111_vexpress.c > new file mode 100644 > index 000000000000..720244f497fe > --- /dev/null > +++ b/drivers/gpu/drm/pl111/pl111_vexpress.c > @@ -0,0 +1,106 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Versatile Express PL111 handling > + * Copyright (C) 2018 Linus Walleij > + * > + * This module binds to the "arm,vexpress-muxfpga" device on the > + * Versatile Express configuration bus and sets up which CLCD instance > + * gets muxed out on the DVI bridge. > + */ > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include "pl111_drm.h" > +#include "pl111_vexpress.h" > + > +#define VEXPRESS_FPGAMUX_MOTHERBOARD 0x00 > +#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_1 0x01 > +#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_2 0x02 > + > +static bool daughterboard_muxed =3D false; > +static bool motherboard_muxed =3D false; > + > +int pl111_vexpress_clcd_init(struct device *dev, > + struct pl111_drm_dev_private *priv, > + struct regmap *map) > +{ > + struct device_node *memory; > + u32 val; > + int ret; > + > + /* > + * The CLCD on the motherboard has a special memory region and > + * does not make use of CMA. We differentiate between the different > + * CLCD controllers using this memory region phandle. > + */ > + memory =3D of_parse_phandle(dev->of_node, "memory-region", 0); > + if (!memory) { > + if (motherboard_muxed) { > + dev_info(dev, "motherboard CLCD muxed in\n"); > + dev_info(dev, "daughterboard takes precedence\n"); > + dev_info(dev, "motherboard CLCD will not be muxed out\n"); > + } > + dev_info(dev, > + "DVI muxed to daughterboard 1 (core tile) CLCD\n"); > + val =3D VEXPRESS_FPGAMUX_DAUGHTERBOARD_1; > + daughterboard_muxed =3D true; > + } else { > + priv->clcd_memory =3D of_iomap(memory, 0); > + if (!priv->clcd_memory) > + dev_err(dev, "could not remap CLCD memory\n"); > + /* Fall through and try to use CMA */ > + if (daughterboard_muxed) { > + dev_info(dev, "daughterboard takes precedence\n"); > + dev_info(dev, "motherboard CLCD will not be muxed out\n"); > + return -ENODEV; > + } > + dev_info(dev, "DVI muxed to motherboard CLCD\n"); > + val =3D VEXPRESS_FPGAMUX_MOTHERBOARD; > + motherboard_muxed =3D true; > + } I'm confused by global bools here. It seems like we're trying to coordinate between the instantiation of multiple CLCDs here, to set up the mux appropriately. Does it make sense to do things that way, if probe order is unreliable? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE/JuuFDWp9/ZkuCBXtdYpNtH8nugFAlrJbW0ACgkQtdYpNtH8 nuikww//WUN+Yr7jV1LYm0Tjip1/rC9wO+ZA+BD5WNFImscnO1VeDYSkQi2XdiR3 4ma+zRkN3xRJpqSPMuG+SfBcPw3z/sG1QBWowEuqDHrD+PWD8ZzxQzOIXeC/8rpW +8dui4Upxvz2uelUhc/6BWkKPgpipDYIYYtRi5dXKAtuLJbQkSCHzFDAbBn+8Vla lhqcMtuK1B9UZYvV6+oMZPp0WZerTgft5XlivJV8hYWKPaEZaL/v81Vb7e283I4+ J44/SIuBg2VsKWQRkXvnz5PiywXv+zs6J1slLo4WGrLHunnMvlYmFZD27F+nF1j0 0TtbyVmYgPSGmmXfkUdSuPf6bCbxOW4YjmqeZgKG9L8aynhJKD/BWwhqlb6ZCy2t MDSnKXF0KMDUKnpHEpJRjCo9sw9jgc4WeRGIVzHb4OzL80UpnMkGrBGYSQIrsA5N wfI9jOW8USzKuCbIhDpxUOuWsnUOMcjj/NBn5NohErFs2mhPI+nBuzGGwj+Ga+GZ QUNISzZ0wW1scuUoggV556n1E1lGSFraitjccCVbZbYVLrqO+kxZ9m1/KqhVpWxb EyT/Ah3P8b209q0byTauTiGf0KnmZe5HbL7HQUZ9tnKilfT1c52WVj+XlxHgNauG nv3NE3tjdjDyKjUH5oBmNaZyK5wqioQOyKdi7SRQOLoeOm9KHD0= =/CHY -----END PGP SIGNATURE----- --=-=-=-- --===============0925522337== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --===============0925522337==--