From: Thierry Reding <thierry.reding@gmail.com> To: Hans de Goede <hdegoede@redhat.com>, Helge Deller <deller@gmx.de> Cc: Robert Foss <rfoss@kernel.org>, Jon Hunter <jonathanh@nvidia.com>, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] fbdev/simplefb: Support memory-region property Date: Wed, 11 Oct 2023 16:38:08 +0200 [thread overview] Message-ID: <20231011143809.1108034-2-thierry.reding@gmail.com> (raw) In-Reply-To: <20231011143809.1108034-1-thierry.reding@gmail.com> From: Thierry Reding <treding@nvidia.com> The simple-framebuffer bindings specify that the "memory-region" property can be used as an alternative to the "reg" property to define the framebuffer memory used by the display hardware. Implement support for this in the simplefb driver. Signed-off-by: Thierry Reding <treding@nvidia.com> --- drivers/video/fbdev/simplefb.c | 35 +++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c index 62f99f6fccd3..18025f34fde7 100644 --- a/drivers/video/fbdev/simplefb.c +++ b/drivers/video/fbdev/simplefb.c @@ -21,6 +21,7 @@ #include <linux/platform_device.h> #include <linux/clk.h> #include <linux/of.h> +#include <linux/of_address.h> #include <linux/of_clk.h> #include <linux/of_platform.h> #include <linux/parser.h> @@ -121,12 +122,13 @@ struct simplefb_params { u32 height; u32 stride; struct simplefb_format *format; + struct resource memory; }; static int simplefb_parse_dt(struct platform_device *pdev, struct simplefb_params *params) { - struct device_node *np = pdev->dev.of_node; + struct device_node *np = pdev->dev.of_node, *mem; int ret; const char *format; int i; @@ -166,6 +168,23 @@ static int simplefb_parse_dt(struct platform_device *pdev, return -EINVAL; } + mem = of_parse_phandle(np, "memory-region", 0); + if (mem) { + ret = of_address_to_resource(mem, 0, ¶ms->memory); + if (ret < 0) { + dev_err(&pdev->dev, "failed to parse memory-region\n"); + of_node_put(mem); + return ret; + } + + if (of_property_present(np, "reg")) + dev_warn(&pdev->dev, "preferring \"memory-region\" over \"reg\" property\n"); + + of_node_put(mem); + } else { + memset(¶ms->memory, 0, sizeof(params->memory)); + } + return 0; } @@ -193,6 +212,8 @@ static int simplefb_parse_pd(struct platform_device *pdev, return -EINVAL; } + memset(¶ms->memory, 0, sizeof(params->memory)); + return 0; } @@ -431,10 +452,14 @@ static int simplefb_probe(struct platform_device *pdev) if (ret) return ret; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "No memory resource\n"); - return -EINVAL; + if (params.memory.start == 0 && params.memory.end == 0) { + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(&pdev->dev, "No memory resource\n"); + return -EINVAL; + } + } else { + res = ¶ms.memory; } mem = request_mem_region(res->start, resource_size(res), "simplefb"); -- 2.42.0
WARNING: multiple messages have this Message-ID (diff)
From: Thierry Reding <thierry.reding@gmail.com> To: Hans de Goede <hdegoede@redhat.com>, Helge Deller <deller@gmx.de> Cc: linux-fbdev@vger.kernel.org, Robert Foss <rfoss@kernel.org>, dri-devel@lists.freedesktop.org, Jon Hunter <jonathanh@nvidia.com> Subject: [PATCH 1/2] fbdev/simplefb: Support memory-region property Date: Wed, 11 Oct 2023 16:38:08 +0200 [thread overview] Message-ID: <20231011143809.1108034-2-thierry.reding@gmail.com> (raw) In-Reply-To: <20231011143809.1108034-1-thierry.reding@gmail.com> From: Thierry Reding <treding@nvidia.com> The simple-framebuffer bindings specify that the "memory-region" property can be used as an alternative to the "reg" property to define the framebuffer memory used by the display hardware. Implement support for this in the simplefb driver. Signed-off-by: Thierry Reding <treding@nvidia.com> --- drivers/video/fbdev/simplefb.c | 35 +++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c index 62f99f6fccd3..18025f34fde7 100644 --- a/drivers/video/fbdev/simplefb.c +++ b/drivers/video/fbdev/simplefb.c @@ -21,6 +21,7 @@ #include <linux/platform_device.h> #include <linux/clk.h> #include <linux/of.h> +#include <linux/of_address.h> #include <linux/of_clk.h> #include <linux/of_platform.h> #include <linux/parser.h> @@ -121,12 +122,13 @@ struct simplefb_params { u32 height; u32 stride; struct simplefb_format *format; + struct resource memory; }; static int simplefb_parse_dt(struct platform_device *pdev, struct simplefb_params *params) { - struct device_node *np = pdev->dev.of_node; + struct device_node *np = pdev->dev.of_node, *mem; int ret; const char *format; int i; @@ -166,6 +168,23 @@ static int simplefb_parse_dt(struct platform_device *pdev, return -EINVAL; } + mem = of_parse_phandle(np, "memory-region", 0); + if (mem) { + ret = of_address_to_resource(mem, 0, ¶ms->memory); + if (ret < 0) { + dev_err(&pdev->dev, "failed to parse memory-region\n"); + of_node_put(mem); + return ret; + } + + if (of_property_present(np, "reg")) + dev_warn(&pdev->dev, "preferring \"memory-region\" over \"reg\" property\n"); + + of_node_put(mem); + } else { + memset(¶ms->memory, 0, sizeof(params->memory)); + } + return 0; } @@ -193,6 +212,8 @@ static int simplefb_parse_pd(struct platform_device *pdev, return -EINVAL; } + memset(¶ms->memory, 0, sizeof(params->memory)); + return 0; } @@ -431,10 +452,14 @@ static int simplefb_probe(struct platform_device *pdev) if (ret) return ret; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "No memory resource\n"); - return -EINVAL; + if (params.memory.start == 0 && params.memory.end == 0) { + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(&pdev->dev, "No memory resource\n"); + return -EINVAL; + } + } else { + res = ¶ms.memory; } mem = request_mem_region(res->start, resource_size(res), "simplefb"); -- 2.42.0
next prev parent reply other threads:[~2023-10-11 14:38 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-10-11 14:38 [PATCH 0/2] fbdev/simplefb: Add missing simple-framebuffer features Thierry Reding 2023-10-11 14:38 ` Thierry Reding 2023-10-11 14:38 ` Thierry Reding [this message] 2023-10-11 14:38 ` [PATCH 1/2] fbdev/simplefb: Support memory-region property Thierry Reding 2023-10-26 12:31 ` Hans de Goede 2023-10-26 12:31 ` Hans de Goede 2023-10-11 14:38 ` [PATCH 2/2] fbdev/simplefb: Add support for generic power-domains Thierry Reding 2023-10-11 14:38 ` Thierry Reding 2023-10-12 12:04 ` kernel test robot 2023-10-12 12:04 ` kernel test robot 2023-10-18 10:35 ` Robert Foss 2023-10-18 12:18 ` Robert Foss 2023-10-26 12:50 ` Hans de Goede 2023-10-26 12:50 ` Hans de Goede 2023-11-01 16:50 ` Thierry Reding 2023-11-01 16:50 ` Thierry Reding 2023-11-01 17:37 ` Hans de Goede 2023-11-01 17:37 ` Hans de Goede 2023-10-19 8:06 ` [PATCH 0/2] fbdev/simplefb: Add missing simple-framebuffer features Maxime Ripard 2023-10-19 8:06 ` Maxime Ripard 2023-10-19 8:38 ` Javier Martinez Canillas 2023-10-23 10:09 ` Maxime Ripard 2023-10-23 10:09 ` Maxime Ripard
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=20231011143809.1108034-2-thierry.reding@gmail.com \ --to=thierry.reding@gmail.com \ --cc=deller@gmx.de \ --cc=dri-devel@lists.freedesktop.org \ --cc=hdegoede@redhat.com \ --cc=jonathanh@nvidia.com \ --cc=linux-fbdev@vger.kernel.org \ --cc=rfoss@kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.