Module Name: src
Committed By: jmcneill
Date: Thu Oct 22 09:28:30 UTC 2020
Modified Files:
src/sys/stand/efiboot: efifdt.c
Log Message:
Fix previous.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/stand/efiboot/efifdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/stand/efiboot/efifdt.c
diff -u src/sys/stand/efiboot/efifdt.c:1.26 src/sys/stand/efiboot/efifdt.c:1.27
--- src/sys/stand/efiboot/efifdt.c:1.26 Thu Oct 22 09:14:40 2020
+++ src/sys/stand/efiboot/efifdt.c Thu Oct 22 09:28:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: efifdt.c,v 1.26 2020/10/22 09:14:40 jmcneill Exp $ */
+/* $NetBSD: efifdt.c,v 1.27 2020/10/22 09:28:30 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jason R. Thorpe
@@ -338,21 +338,17 @@ efi_fdt_gop(void)
continue;
}
- snprintf(buf, sizeof(buf), "framebuffer@%" PRIx64, mode->FrameBufferBase);
- fb = fdt_path_offset(fdt_data, buf);
- if (fb >= 0) {
- /* Framebuffer node already exists, no need to create one */
- return;
- }
-
chosen = efi_fdt_chosen();
fdt_setprop_u32(fdt_data, chosen, "#address-cells", 2);
fdt_setprop_u32(fdt_data, chosen, "#size-cells", 2);
fdt_setprop_empty(fdt_data, chosen, "ranges");
+ snprintf(buf, sizeof(buf), "framebuffer@%" PRIx64, mode->FrameBufferBase);
fb = fdt_add_subnode(fdt_data, chosen, buf);
- if (fb < 0)
- panic("FDT: Failed to create framebuffer node");
+ if (fb < 0) {
+ /* Framebuffer node already exists. No need to create a new one! */
+ return;
+ }
fdt_appendprop_string(fdt_data, fb, "compatible", "simple-framebuffer");
fdt_appendprop_string(fdt_data, fb, "status", "okay");
