diff mbox series

[2/2] video: meson: Use reserving memory function without kernel linear mapping

Message ID 20200225051021.15311-3-michael@amarulasolutions.com
State Needs Review / ACK
Delegated to: Anatolij Gustschin
Headers show
Series Update reserved memory for simple framebuffer | expand

Commit Message

Michael Nazzareno Trimarchi Feb. 25, 2020, 5:10 a.m. UTC
Memory reserved for the simple framebuffer should not be used
and part of memory linear mapping. See
https://patchwork.kernel.org/patch/10486131/ for more detailed
background information and discussion.

Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
---
Changes RFC -> v1:
	- Fix compilation issue on RFC
	- change node name from display_reserved to display-reserved
---
 drivers/video/meson/meson_vpu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Simon Glass Feb. 26, 2020, 3:33 p.m. UTC | #1
Hi Michae,

On Mon, 24 Feb 2020 at 22:10, Michael Trimarchi
<michael@amarulasolutions.com> wrote:
>
> Memory reserved for the simple framebuffer should not be used
> and part of memory linear mapping. See
> https://patchwork.kernel.org/patch/10486131/ for more detailed
> background information and discussion.
>
> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
> ---
> Changes RFC -> v1:
>         - Fix compilation issue on RFC
>         - change node name from display_reserved to display-reserved
> ---
>  drivers/video/meson/meson_vpu.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Is the binding file for this in U-Boot? If not can you please add it?

>
> diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
> index 4eb66398d0..5bfad05d75 100644
> --- a/drivers/video/meson/meson_vpu.c
> +++ b/drivers/video/meson/meson_vpu.c
> @@ -173,9 +173,9 @@ static void meson_vpu_setup_simplefb(void *fdt)
>          * at the end of the RAM and we strip this portion from the kernel
>          * allowed region
>          */
> -       mem_start = gd->bd->bi_dram[0].start;
> -       mem_size = gd->bd->bi_dram[0].size - meson_fb.fb_size;
> -       ret = fdt_fixup_memory_banks(fdt, &mem_start, &mem_size, 1);
> +       mem_start = meson_fb.base;
> +       mem_size = meson_fb.fb_size;
> +       ret = fdt_fixup_reserved_memory(fdt, "display-reserved", &mem_start, &mem_size);
>         if (ret) {
>                 eprintf("Cannot setup simplefb: Error reserving memory\n");
>                 return;

Needs to return an error code which needs to be checked by caller.

> --
> 2.17.1
>

Regards,
Simon
diff mbox series

Patch

diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index 4eb66398d0..5bfad05d75 100644
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -173,9 +173,9 @@  static void meson_vpu_setup_simplefb(void *fdt)
 	 * at the end of the RAM and we strip this portion from the kernel
 	 * allowed region
 	 */
-	mem_start = gd->bd->bi_dram[0].start;
-	mem_size = gd->bd->bi_dram[0].size - meson_fb.fb_size;
-	ret = fdt_fixup_memory_banks(fdt, &mem_start, &mem_size, 1);
+	mem_start = meson_fb.base;
+	mem_size = meson_fb.fb_size;
+	ret = fdt_fixup_reserved_memory(fdt, "display-reserved", &mem_start, &mem_size);
 	if (ret) {
 		eprintf("Cannot setup simplefb: Error reserving memory\n");
 		return;