From: Thomas Zimmermann <tzimmermann@suse.de>
To: daniel@ffwll.ch, airlied@linux.ie,
maarten.lankhorst@linux.intel.com, mripard@kernel.org,
kraxel@redhat.com, corbet@lwn.net, lgirdwood@gmail.com,
broonie@kernel.org, sam@ravnborg.org, robh@kernel.org,
emil.l.velikov@gmail.com, geert+renesas@glider.be,
hdegoede@redhat.com, bluescreen_avenger@verizon.net
Cc: dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org,
virtualization@lists.linux-foundation.org,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: [PATCH v2 07/10] drm/simpledrm: Initialize framebuffer data from device-tree node
Date: Thu, 18 Mar 2021 11:29:18 +0100 [thread overview]
Message-ID: <20210318102921.21536-8-tzimmermann@suse.de> (raw)
In-Reply-To: <20210318102921.21536-1-tzimmermann@suse.de>
A firmware framebuffer might also be specified via device-tree files. If
no device platform data is given, try the DT device node.
v2:
* add Device Tree match table
* clean-up parser wrappers
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Tested-by: nerdopolis <bluescreen_avenger@verizon.net>
---
drivers/gpu/drm/tiny/simpledrm.c | 89 ++++++++++++++++++++++++++++++++
1 file changed, 89 insertions(+)
diff --git a/drivers/gpu/drm/tiny/simpledrm.c b/drivers/gpu/drm/tiny/simpledrm.c
index 4f0d4ec0b432..c9cef2b50de6 100644
--- a/drivers/gpu/drm/tiny/simpledrm.c
+++ b/drivers/gpu/drm/tiny/simpledrm.c
@@ -114,6 +114,74 @@ simplefb_get_format_pd(struct drm_device *dev,
return simplefb_get_validated_format(dev, pd->format);
}
+static int
+simplefb_read_u32_of(struct drm_device *dev, struct device_node *of_node,
+ const char *name, u32 *value)
+{
+ int ret = of_property_read_u32(of_node, name, value);
+
+ if (ret)
+ drm_err(dev, "simplefb: cannot parse framebuffer %s: error %d\n",
+ name, ret);
+ return ret;
+}
+
+static int
+simplefb_read_string_of(struct drm_device *dev, struct device_node *of_node,
+ const char *name, const char **value)
+{
+ int ret = of_property_read_string(of_node, name, value);
+
+ if (ret)
+ drm_err(dev, "simplefb: cannot parse framebuffer %s: error %d\n",
+ name, ret);
+ return ret;
+}
+
+static int
+simplefb_get_width_of(struct drm_device *dev, struct device_node *of_node)
+{
+ u32 width;
+ int ret = simplefb_read_u32_of(dev, of_node, "width", &width);
+
+ if (ret)
+ return ret;
+ return simplefb_get_validated_int0(dev, "width", width);
+}
+
+static int
+simplefb_get_height_of(struct drm_device *dev, struct device_node *of_node)
+{
+ u32 height;
+ int ret = simplefb_read_u32_of(dev, of_node, "height", &height);
+
+ if (ret)
+ return ret;
+ return simplefb_get_validated_int0(dev, "height", height);
+}
+
+static int
+simplefb_get_stride_of(struct drm_device *dev, struct device_node *of_node)
+{
+ u32 stride;
+ int ret = simplefb_read_u32_of(dev, of_node, "stride", &stride);
+
+ if (ret)
+ return ret;
+ return simplefb_get_validated_int(dev, "stride", stride);
+}
+
+static const struct drm_format_info *
+simplefb_get_format_of(struct drm_device *dev, struct device_node *of_node)
+{
+ const char *format;
+ int ret = simplefb_read_string_of(dev, of_node, "format", &format);
+
+ if (ret)
+ return ERR_PTR(ret);
+ return simplefb_get_validated_format(dev, format);
+}
+
/*
* Simple Framebuffer device
*/
@@ -166,6 +234,7 @@ static int simpledrm_device_init_fb(struct simpledrm_device *sdev)
struct drm_device *dev = &sdev->dev;
struct platform_device *pdev = sdev->pdev;
const struct simplefb_platform_data *pd = dev_get_platdata(&pdev->dev);
+ struct device_node *of_node = pdev->dev.of_node;
if (pd) {
width = simplefb_get_width_pd(dev, pd);
@@ -180,6 +249,19 @@ static int simpledrm_device_init_fb(struct simpledrm_device *sdev)
format = simplefb_get_format_pd(dev, pd);
if (IS_ERR(format))
return PTR_ERR(format);
+ } else if (of_node) {
+ width = simplefb_get_width_of(dev, of_node);
+ if (width < 0)
+ return width;
+ height = simplefb_get_height_of(dev, of_node);
+ if (height < 0)
+ return height;
+ stride = simplefb_get_stride_of(dev, of_node);
+ if (stride < 0)
+ return stride;
+ format = simplefb_get_format_of(dev, of_node);
+ if (IS_ERR(format))
+ return PTR_ERR(format);
} else {
drm_err(dev, "no simplefb configuration found\n");
return -ENODEV;
@@ -516,9 +598,16 @@ static int simpledrm_remove(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id simpledrm_of_match_table[] = {
+ { .compatible = "simple-framebuffer", },
+ { },
+};
+MODULE_DEVICE_TABLE(of, simpledrm_of_match_table);
+
static struct platform_driver simpledrm_platform_driver = {
.driver = {
.name = "simple-framebuffer", /* connect to sysfb */
+ .of_match_table = simpledrm_of_match_table,
},
.probe = simpledrm_probe,
.remove = simpledrm_remove,
--
2.30.1
next prev parent reply other threads:[~2021-03-18 10:30 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 10:29 [PATCH v2 00/10] drm: Support simple-framebuffer devices and firmware fbs Thomas Zimmermann
2021-03-18 10:29 ` [PATCH v2 01/10] drm/format-helper: Pass destination pitch to drm_fb_memcpy_dstclip() Thomas Zimmermann
2021-03-18 10:29 ` [PATCH v2 02/10] drm/format-helper: Add blitter functions Thomas Zimmermann
2021-03-18 10:29 ` [PATCH v2 03/10] drm/aperture: Move fbdev conflict helpers into drm_aperture.h Thomas Zimmermann
2021-04-08 9:50 ` Daniel Vetter
2021-04-09 7:09 ` Thomas Zimmermann
2021-03-18 10:29 ` [PATCH v2 04/10] drm/aperture: Add infrastructure for aperture ownership Thomas Zimmermann
2021-04-08 9:48 ` Daniel Vetter
2021-04-09 7:06 ` Thomas Zimmermann
2021-04-09 9:22 ` Daniel Vetter
2021-04-15 6:56 ` Thomas Zimmermann
2021-04-15 12:57 ` Daniel Vetter
2021-04-15 19:12 ` Thomas Zimmermann
2021-04-16 8:42 ` Daniel Vetter
2021-04-09 7:54 ` Thomas Zimmermann
2021-04-09 9:29 ` Daniel Vetter
2021-03-18 10:29 ` [PATCH v2 05/10] drm: Add simpledrm driver Thomas Zimmermann
2021-03-18 10:29 ` [PATCH v2 06/10] drm/simpledrm: Add fbdev emulation Thomas Zimmermann
2021-03-18 10:29 ` Thomas Zimmermann [this message]
2021-03-18 10:29 ` [PATCH v2 08/10] drm/simpledrm: Acquire clocks from DT device node Thomas Zimmermann
2021-03-18 10:39 ` Geert Uytterhoeven
2021-03-18 11:00 ` Thomas Zimmermann
2021-04-08 8:13 ` Maxime Ripard
2021-04-15 7:31 ` Thomas Zimmermann
2021-04-15 9:21 ` Maxime Ripard
2021-04-15 11:02 ` Thomas Zimmermann
2021-04-15 12:11 ` maxime
2021-03-18 10:29 ` [PATCH v2 09/10] drm/simpledrm: Acquire regulators " Thomas Zimmermann
2021-03-18 10:29 ` [PATCH v2 10/10] drm/simpledrm: Acquire memory aperture for framebuffer Thomas Zimmermann
2021-03-25 11:29 ` [PATCH v2 00/10] drm: Support simple-framebuffer devices and firmware fbs Hans de Goede
2021-03-29 12:31 ` Thomas Zimmermann
2021-03-29 14:50 ` Hans de Goede
2021-03-30 7:09 ` Thomas Zimmermann
2021-03-30 8:34 ` Hans de Goede
2021-04-08 10:14 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210318102921.21536-8-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@linux.ie \
--cc=bluescreen_avenger@verizon.net \
--cc=broonie@kernel.org \
--cc=corbet@lwn.net \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
--cc=geert+renesas@glider.be \
--cc=hdegoede@redhat.com \
--cc=kraxel@redhat.com \
--cc=lgirdwood@gmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=robh@kernel.org \
--cc=sam@ravnborg.org \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).