From 46386e37050c89e5175af54cbc2a8cc7a2bdc377 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sun, 25 Sep 2022 07:21:47 +0000 Subject: [PATCH 1/2] rkdrm: Set is_console on the drm device, not the fb child. The drm device is represented by a rockchip,display-subsystem node in the device tree. The fb child is a purely software abstraction used by drm. The is_console property is used by MD firmware logic to mark which actual device in hardware bus enumeration like PCI or FDT the system has chosen for the console early at boot, so hanging it on the node for the real hardware device makes more sense than hanging it on the software abstraction, and is consistent with recent changes to drmfb to respect its setting on other platforms for hardware devices. --- sys/arch/arm/rockchip/rk_drm.c | 5 +++++ sys/arch/arm/rockchip/rk_fb.c | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/arch/arm/rockchip/rk_drm.c b/sys/arch/arm/rockchip/rk_drm.c index 8c59be4a8f79..e5da884c47a1 100644 --- a/sys/arch/arm/rockchip/rk_drm.c +++ b/sys/arch/arm/rockchip/rk_drm.c @@ -133,6 +133,11 @@ rk_drm_attach(device_t parent, device_t self, void *aux) aprint_normal("\n"); +#ifdef WSDISPLAY_MULTICONS + const bool is_console = true; + prop_dictionary_set_bool(dict, "is_console", is_console); +#endif + sc->sc_dev = self; sc->sc_dmat = faa->faa_dmat; sc->sc_bst = faa->faa_bst; diff --git a/sys/arch/arm/rockchip/rk_fb.c b/sys/arch/arm/rockchip/rk_fb.c index 80cb8f7fbed2..37e52dcf2ec8 100644 --- a/sys/arch/arm/rockchip/rk_fb.c +++ b/sys/arch/arm/rockchip/rk_fb.c @@ -88,12 +88,6 @@ rk_fb_attach(device_t parent, device_t self, void *aux) aprint_naive("\n"); aprint_normal("\n"); -#ifdef WSDISPLAY_MULTICONS - prop_dictionary_t dict = device_properties(self); - const bool is_console = true; - prop_dictionary_set_bool(dict, "is_console", is_console); -#endif - rk_task_init(&sc->sc_attach_task, &rk_fb_init); rk_task_schedule(parent, &sc->sc_attach_task); } From 126ec8dcc7d76c4d3a8a03f0107950fd5bea21bf Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sun, 25 Sep 2022 07:25:51 +0000 Subject: [PATCH 2/2] sunxidrm: Set is_console on the drm device, not the fb child. The drm device is represented by a rockchip,display-subsystem node in the device tree. The fb child is a purely software abstraction used by drm. The is_console property is used by MD firmware logic to mark which actual device in hardware bus enumeration like PCI or FDT the system has chosen for the console early at boot, so hanging it on the node for the real hardware device makes more sense than hanging it on the software abstraction, and is consistent with recent changes to drmfb to respect its setting on other platforms for hardware devices. --- sys/arch/arm/sunxi/sunxi_drm.c | 5 +++++ sys/arch/arm/sunxi/sunxi_fb.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arch/arm/sunxi/sunxi_drm.c b/sys/arch/arm/sunxi/sunxi_drm.c index 7f4908efa224..7c8d25236fdb 100644 --- a/sys/arch/arm/sunxi/sunxi_drm.c +++ b/sys/arch/arm/sunxi/sunxi_drm.c @@ -149,6 +149,11 @@ sunxi_drm_attach(device_t parent, device_t self, void *aux) aprint_normal(": Display Engine Pipeline\n"); +#ifdef WSDISPLAY_MULTICONS + const bool is_console = true; + prop_dictionary_set_bool(dict, "is_console", is_console); +#endif + sc->sc_dev = self; sc->sc_dmat = faa->faa_dmat; sc->sc_bst = faa->faa_bst; diff --git a/sys/arch/arm/sunxi/sunxi_fb.c b/sys/arch/arm/sunxi/sunxi_fb.c index 33760c9a3213..4094a445e287 100644 --- a/sys/arch/arm/sunxi/sunxi_fb.c +++ b/sys/arch/arm/sunxi/sunxi_fb.c @@ -92,11 +92,6 @@ sunxi_fb_attach(device_t parent, device_t self, void *aux) aprint_naive("\n"); aprint_normal("\n"); -#ifdef WSDISPLAY_MULTICONS - prop_dictionary_t dict = device_properties(self); - const bool is_console = true; - prop_dictionary_set_bool(dict, "is_console", is_console); -#endif sunxi_task_init(&sc->sc_attach_task, &sunxi_fb_init); sunxi_task_schedule(parent, &sc->sc_attach_task); }