Rename WSDISPLAY_TYPE_RKDRM to WSDISPLAY_TYPE_KMS such that we can use it

for other generic KMS drivers.

ok jsg@, matthieu@

diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c
index d3e90dd..82f03e8 100644 (file)
--- a/sbin/wsconsctl/util.c
+++ b/sbin/wsconsctl/util.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: util.c,v 1.69 2020/10/01 17:29:39 kettenis Exp $ */
+/*     $OpenBSD: util.c,v 1.70 2024/01/19 17:51:15 kettenis Exp $ */
 /*     $NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */
 
 /*-
@@ -171,7 +171,7 @@ static const struct nameint dpytype_tab[] = {
        { WSDISPLAY_TYPE_INTELDRM,      "inteldrm" },
        { WSDISPLAY_TYPE_RADEONDRM,     "radeondrm" },
        { WSDISPLAY_TYPE_EFIFB,         "efifb" },
-       { WSDISPLAY_TYPE_RKDRM,         "rkdrm" },
+       { WSDISPLAY_TYPE_KMS,           "kms" },
        { WSDISPLAY_TYPE_ASTFB,         "astfb" }
 };
 

diff --git a/sys/dev/fdt/rkdrm.c b/sys/dev/fdt/rkdrm.c
index cac3ccb..e444570 100644 (file)
--- a/sys/dev/fdt/rkdrm.c
+++ b/sys/dev/fdt/rkdrm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rkdrm.c,v 1.19 2024/01/16 23:37:50 jsg Exp $ */
+/* $OpenBSD: rkdrm.c,v 1.20 2024/01/19 17:51:15 kettenis Exp $ */
 /* $NetBSD: rk_drm.c,v 1.3 2019/12/15 01:00:58 mrg Exp $ */
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -266,7 +266,7 @@ rkdrm_wsioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
                        return ws_set_param(dp);
                return -1;
        case WSDISPLAYIO_GTYPE:
-               *(u_int *)data = WSDISPLAY_TYPE_RKDRM;
+               *(u_int *)data = WSDISPLAY_TYPE_KMS;
                return 0;
        case WSDISPLAYIO_GINFO:
                wdf = (struct wsdisplay_fbinfo *)data;

diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h
index 574c593..332b650 100644 (file)
--- a/sys/dev/wscons/wsconsio.h
+++ b/sys/dev/wscons/wsconsio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsconsio.h,v 1.100 2023/07/02 21:44:04 bru Exp $ */
+/* $OpenBSD: wsconsio.h,v 1.101 2024/01/19 17:51:15 kettenis Exp $ */
 /* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */
 
 /*
@@ -461,7 +461,7 @@ struct wsmouse_parameters {
 #define                WSDISPLAY_TYPE_INTELDRM 69      /* Intel KMS framebuffer */
 #define                WSDISPLAY_TYPE_RADEONDRM 70     /* ATI Radeon KMS framebuffer */
 #define                WSDISPLAY_TYPE_EFIFB    71      /* EFI framebuffer */
-#define                WSDISPLAY_TYPE_RKDRM    72      /* Rockchip KMS framebuffer */
+#define                WSDISPLAY_TYPE_KMS      72      /* Generic KMS framebuffer */
 #define                WSDISPLAY_TYPE_ASTFB    73      /* AST framebuffer */
 #define                WSDISPLAY_TYPE_VIOGPU   74      /* VirtIO GPU */