Re: [PATCH] drm/pl111: Support Integrator IM-PD1 module
On Thu, Feb 13, 2020 at 3:49 PM Daniel Vetter wrote: > Looking around in the arm/mach-integrator code this seems to match > roughly :-) I noticed there's also two more outputs for two panels, > but not here. Do we not care about these anymore? I actually have that hardware too (Integrator/PP2) and it is trivial to support using the existing code, one can just define the panel in the device tree. It might need some new define in panel-simple.c as well. Yours, Linus Walleij ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH] drm/pl111: Support Integrator IM-PD1 module
On Thu, Feb 13, 2020 at 1:48 PM Linus Walleij wrote:
> The last in-kernel user of the old framebuffer driver is the
> IM-PD1 module for the Integrator/AP. Let's implement support for
> this remaining user so we can migrate the last user over to
> DRM and delete the old FB driver.
>
> On the Integrator/AP the IM-PD1 system controller will exist
> alongside the common Integrator system controller so make
> sure to do a special lookup for the IM-PD1 syscon and make it
> take precedence if found.
>
> Tested on the Integrator/AP with the IM-PD1 mounted.
>
> Signed-off-by: Linus Walleij
Looking around in the arm/mach-integrator code this seems to match
roughly :-) I noticed there's also two more outputs for two panels,
but not here. Do we not care about these anymore?
Anyway, lgtm. Acked-by: Daniel Vetter
> ---
> drivers/gpu/drm/pl111/pl111_versatile.c | 73 +
> 1 file changed, 73 insertions(+)
>
> diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c
> b/drivers/gpu/drm/pl111/pl111_versatile.c
> index 09aeaffb7660..4f325c410b5d 100644
> --- a/drivers/gpu/drm/pl111/pl111_versatile.c
> +++ b/drivers/gpu/drm/pl111/pl111_versatile.c
> @@ -19,6 +19,7 @@ static struct regmap *versatile_syscon_map;
> * We detect the different syscon types from the compatible strings.
> */
> enum versatile_clcd {
> + INTEGRATOR_IMPD1,
> INTEGRATOR_CLCD_CM,
> VERSATILE_CLCD,
> REALVIEW_CLCD_EB,
> @@ -65,6 +66,14 @@ static const struct of_device_id versatile_clcd_of_match[]
> = {
> {},
> };
>
> +static const struct of_device_id impd1_clcd_of_match[] = {
> + {
> + .compatible = "arm,im-pd1-syscon",
> + .data = (void *)INTEGRATOR_IMPD1,
> + },
> + {},
> +};
> +
> /*
> * Core module CLCD control on the Integrator/CP, bits
> * 8 thru 19 of the CM_CONTROL register controls a bunch
> @@ -125,6 +134,36 @@ static void pl111_integrator_enable(struct drm_device
> *drm, u32 format)
>val);
> }
>
> +#define IMPD1_CTRL_OFFSET 0x18
> +#define IMPD1_CTRL_DISP_LCD(0 << 0)
> +#define IMPD1_CTRL_DISP_VGA(1 << 0)
> +#define IMPD1_CTRL_DISP_LCD1 (2 << 0)
> +#define IMPD1_CTRL_DISP_ENABLE (1 << 2)
> +#define IMPD1_CTRL_DISP_MASK (7 << 0)
> +
> +static void pl111_impd1_enable(struct drm_device *drm, u32 format)
> +{
> + u32 val;
> +
> + dev_info(drm->dev, "enable IM-PD1 CLCD connectors\n");
> + val = IMPD1_CTRL_DISP_VGA | IMPD1_CTRL_DISP_ENABLE;
> +
> + regmap_update_bits(versatile_syscon_map,
> + IMPD1_CTRL_OFFSET,
> + IMPD1_CTRL_DISP_MASK,
> + val);
> +}
> +
> +static void pl111_impd1_disable(struct drm_device *drm)
> +{
> + dev_info(drm->dev, "disable IM-PD1 CLCD connectors\n");
> +
> + regmap_update_bits(versatile_syscon_map,
> + IMPD1_CTRL_OFFSET,
> + IMPD1_CTRL_DISP_MASK,
> + 0);
> +}
> +
> /*
> * This configuration register in the Versatile and RealView
> * family is uniformly present but appears more and more
> @@ -270,6 +309,20 @@ static const struct pl111_variant_data pl110_integrator
> = {
> .fb_bpp = 16,
> };
>
> +/*
> + * The IM-PD1 variant is a PL110 with a bunch of broken, or not
> + * yet implemented features
> + */
> +static const struct pl111_variant_data pl110_impd1 = {
> + .name = "PL110 IM-PD1",
> + .is_pl110 = true,
> + .broken_clockdivider = true,
> + .broken_vblank = true,
> + .formats = pl110_integrator_pixel_formats,
> + .nformats = ARRAY_SIZE(pl110_integrator_pixel_formats),
> + .fb_bpp = 16,
> +};
> +
> /*
> * This is the in-between PL110 variant found in the ARM Versatile,
> * supporting RGB565/BGR565
> @@ -322,8 +375,21 @@ int pl111_versatile_init(struct device *dev, struct
> pl111_drm_dev_private *priv)
> /* Non-ARM reference designs, just bail out */
> return 0;
> }
> +
> versatile_clcd_type = (enum versatile_clcd)clcd_id->data;
>
> + /*
> +* On the Integrator, check if we should use the IM-PD1 instead,
> +* if we find it, it will take precedence. This is on the
> Integrator/AP
> +* which only has this option for PL110 graphics.
> +*/
> +if (versatile_clcd_type == INTEGRATOR_CLCD_CM) {
> + np = of_find_matching_node_and_match(NULL,
> impd1_clcd_of_match,
> +_id);
> + if (np)
> + versatile_clcd_type = (enum
> versatile_clcd)clcd_id->data;
> + }
> +
> /* Versatile Express special handling */
> if (versatile_clcd_type == VEXPRESS_CLCD_V2M) {
> struct platform_device *pdev;
> @@ -367,6 +433,13 @@ int pl111_versatile_init(struct device *dev, struct
> pl111_drm_dev_private *priv)
>
[PATCH] drm/pl111: Support Integrator IM-PD1 module
The last in-kernel user of the old framebuffer driver is the
IM-PD1 module for the Integrator/AP. Let's implement support for
this remaining user so we can migrate the last user over to
DRM and delete the old FB driver.
On the Integrator/AP the IM-PD1 system controller will exist
alongside the common Integrator system controller so make
sure to do a special lookup for the IM-PD1 syscon and make it
take precedence if found.
Tested on the Integrator/AP with the IM-PD1 mounted.
Signed-off-by: Linus Walleij
---
drivers/gpu/drm/pl111/pl111_versatile.c | 73 +
1 file changed, 73 insertions(+)
diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c
b/drivers/gpu/drm/pl111/pl111_versatile.c
index 09aeaffb7660..4f325c410b5d 100644
--- a/drivers/gpu/drm/pl111/pl111_versatile.c
+++ b/drivers/gpu/drm/pl111/pl111_versatile.c
@@ -19,6 +19,7 @@ static struct regmap *versatile_syscon_map;
* We detect the different syscon types from the compatible strings.
*/
enum versatile_clcd {
+ INTEGRATOR_IMPD1,
INTEGRATOR_CLCD_CM,
VERSATILE_CLCD,
REALVIEW_CLCD_EB,
@@ -65,6 +66,14 @@ static const struct of_device_id versatile_clcd_of_match[] =
{
{},
};
+static const struct of_device_id impd1_clcd_of_match[] = {
+ {
+ .compatible = "arm,im-pd1-syscon",
+ .data = (void *)INTEGRATOR_IMPD1,
+ },
+ {},
+};
+
/*
* Core module CLCD control on the Integrator/CP, bits
* 8 thru 19 of the CM_CONTROL register controls a bunch
@@ -125,6 +134,36 @@ static void pl111_integrator_enable(struct drm_device
*drm, u32 format)
val);
}
+#define IMPD1_CTRL_OFFSET 0x18
+#define IMPD1_CTRL_DISP_LCD(0 << 0)
+#define IMPD1_CTRL_DISP_VGA(1 << 0)
+#define IMPD1_CTRL_DISP_LCD1 (2 << 0)
+#define IMPD1_CTRL_DISP_ENABLE (1 << 2)
+#define IMPD1_CTRL_DISP_MASK (7 << 0)
+
+static void pl111_impd1_enable(struct drm_device *drm, u32 format)
+{
+ u32 val;
+
+ dev_info(drm->dev, "enable IM-PD1 CLCD connectors\n");
+ val = IMPD1_CTRL_DISP_VGA | IMPD1_CTRL_DISP_ENABLE;
+
+ regmap_update_bits(versatile_syscon_map,
+ IMPD1_CTRL_OFFSET,
+ IMPD1_CTRL_DISP_MASK,
+ val);
+}
+
+static void pl111_impd1_disable(struct drm_device *drm)
+{
+ dev_info(drm->dev, "disable IM-PD1 CLCD connectors\n");
+
+ regmap_update_bits(versatile_syscon_map,
+ IMPD1_CTRL_OFFSET,
+ IMPD1_CTRL_DISP_MASK,
+ 0);
+}
+
/*
* This configuration register in the Versatile and RealView
* family is uniformly present but appears more and more
@@ -270,6 +309,20 @@ static const struct pl111_variant_data pl110_integrator = {
.fb_bpp = 16,
};
+/*
+ * The IM-PD1 variant is a PL110 with a bunch of broken, or not
+ * yet implemented features
+ */
+static const struct pl111_variant_data pl110_impd1 = {
+ .name = "PL110 IM-PD1",
+ .is_pl110 = true,
+ .broken_clockdivider = true,
+ .broken_vblank = true,
+ .formats = pl110_integrator_pixel_formats,
+ .nformats = ARRAY_SIZE(pl110_integrator_pixel_formats),
+ .fb_bpp = 16,
+};
+
/*
* This is the in-between PL110 variant found in the ARM Versatile,
* supporting RGB565/BGR565
@@ -322,8 +375,21 @@ int pl111_versatile_init(struct device *dev, struct
pl111_drm_dev_private *priv)
/* Non-ARM reference designs, just bail out */
return 0;
}
+
versatile_clcd_type = (enum versatile_clcd)clcd_id->data;
+ /*
+* On the Integrator, check if we should use the IM-PD1 instead,
+* if we find it, it will take precedence. This is on the Integrator/AP
+* which only has this option for PL110 graphics.
+*/
+if (versatile_clcd_type == INTEGRATOR_CLCD_CM) {
+ np = of_find_matching_node_and_match(NULL, impd1_clcd_of_match,
+_id);
+ if (np)
+ versatile_clcd_type = (enum
versatile_clcd)clcd_id->data;
+ }
+
/* Versatile Express special handling */
if (versatile_clcd_type == VEXPRESS_CLCD_V2M) {
struct platform_device *pdev;
@@ -367,6 +433,13 @@ int pl111_versatile_init(struct device *dev, struct
pl111_drm_dev_private *priv)
priv->variant_display_enable = pl111_integrator_enable;
dev_info(dev, "set up callbacks for Integrator PL110\n");
break;
+ case INTEGRATOR_IMPD1:
+ versatile_syscon_map = map;
+ priv->variant = _impd1;
+ priv->variant_display_enable = pl111_impd1_enable;
+ priv->variant_display_disable = pl111_impd1_disable;
+ dev_info(dev, "set up callbacks for IM-PD1 PL110\n");
+ break;
case VERSATILE_CLCD:
