Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:28:44 UTC 2021
Modified Files:
src/sys/arch/arm/rockchip: rk_drm.c
src/sys/arch/arm/sunxi: sunxi_drm.c
Log Message:
sunxi/drm, rockchip/drm: Avoid messy error output.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/rockchip/rk_drm.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/sunxi/sunxi_drm.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/arch/arm/rockchip/rk_drm.c
diff -u src/sys/arch/arm/rockchip/rk_drm.c:1.13 src/sys/arch/arm/rockchip/rk_drm.c:1.14
--- src/sys/arch/arm/rockchip/rk_drm.c:1.13 Sun Dec 19 12:28:35 2021
+++ src/sys/arch/arm/rockchip/rk_drm.c Sun Dec 19 12:28:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_drm.c,v 1.13 2021/12/19 12:28:35 riastradh Exp $ */
+/* $NetBSD: rk_drm.c,v 1.14 2021/12/19 12:28:44 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.13 2021/12/19 12:28:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.14 2021/12/19 12:28:44 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -129,6 +129,16 @@ rk_drm_attach(device_t parent, device_t
prop_dictionary_t dict = device_properties(self);
bool is_disabled;
+ aprint_naive("\n");
+
+ if (prop_dictionary_get_bool(dict, "disabled", &is_disabled) &&
+ is_disabled) {
+ aprint_normal(": (disabled)\n");
+ return;
+ }
+
+ aprint_normal("\n");
+
sc->sc_dev = self;
sc->sc_dmat = faa->faa_dmat;
sc->sc_bst = faa->faa_bst;
@@ -142,15 +152,6 @@ rk_drm_attach(device_t parent, device_t
return;
}
- aprint_naive("\n");
-
- if (prop_dictionary_get_bool(dict, "disabled", &is_disabled) && is_disabled) {
- aprint_normal(": (disabled)\n");
- return;
- }
-
- aprint_normal("\n");
-
sc->sc_ddev = drm_dev_alloc(driver, sc->sc_dev);
if (IS_ERR(sc->sc_ddev)) {
aprint_error_dev(self, "couldn't allocate DRM device\n");
Index: src/sys/arch/arm/sunxi/sunxi_drm.c
diff -u src/sys/arch/arm/sunxi/sunxi_drm.c:1.22 src/sys/arch/arm/sunxi/sunxi_drm.c:1.23
--- src/sys/arch/arm/sunxi/sunxi_drm.c:1.22 Sun Dec 19 12:28:20 2021
+++ src/sys/arch/arm/sunxi/sunxi_drm.c Sun Dec 19 12:28:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_drm.c,v 1.22 2021/12/19 12:28:20 riastradh Exp $ */
+/* $NetBSD: sunxi_drm.c,v 1.23 2021/12/19 12:28:44 riastradh Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.22 2021/12/19 12:28:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.23 2021/12/19 12:28:44 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -138,6 +138,16 @@ sunxi_drm_attach(device_t parent, device
prop_dictionary_t dict = device_properties(self);
bool is_disabled;
+ aprint_naive("\n");
+
+ if (prop_dictionary_get_bool(dict, "disabled", &is_disabled) &&
+ is_disabled) {
+ aprint_normal(": Display Engine Pipeline (disabled)\n");
+ return;
+ }
+
+ aprint_normal(": Display Engine Pipeline\n");
+
sc->sc_dev = self;
sc->sc_dmat = faa->faa_dmat;
sc->sc_bst = faa->faa_bst;
@@ -151,15 +161,6 @@ sunxi_drm_attach(device_t parent, device
return;
}
- aprint_naive("\n");
-
- if (prop_dictionary_get_bool(dict, "disabled", &is_disabled) && is_disabled) {
- aprint_normal(": Display Engine Pipeline (disabled)\n");
- return;
- }
-
- aprint_normal(": Display Engine Pipeline\n");
-
sc->sc_ddev = drm_dev_alloc(driver, sc->sc_dev);
if (IS_ERR(sc->sc_ddev)) {
aprint_error_dev(self, "couldn't allocate DRM device\n");
