create /dev/ drm nodes with the same names as linux

This was proposed by Emil Velikov to simplify libdrm and will remove the
need for some patches in ports.

/dev/drm0 -> /dev/dri/card0
/dev/drmR128 -> /dev/dri/renderD128

The previous names will remain for a period of time and will later be
removed.  Major and minor numbers remain the same.

libdrm will not be changed to use the new names until known privsep
and sandbox use has been updated to allow the new names.

ok deraadt@

diff --git a/etc/MAKEDEV.common b/etc/MAKEDEV.common
index b5ead87..196d73a 100644 (file)
--- a/etc/MAKEDEV.common
+++ b/etc/MAKEDEV.common
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp $-})dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -343,6 +343,17 @@ _mkdev(pty, pty*, {-if [ $U -gt 15 ]; then
                n=Add($n, 1)
        done-})dnl
 __devitem(dc, dc*, {-4 channel serial interface (keyboard{-,-} mouse{-,-}modem{-,-} printer)-})dnl
+__devitem(dri, dri, Direct Rendering Infrastructure, drm)dnl
+_mkdev(dri, dri, {-RMlist[${#RMlist[*]}]=";mkdir -p dri;rm -f"
+       n=0
+       while [ $n -lt 4 ]
+       do
+               M dri/card$n c major_dri_c $n 600
+               r=Add($n, 128)
+               M dri/renderD$r c major_dri_c $r 600
+               n=Add($n, 1)
+       done
+       MKlist[${#MKlist[*]}]=";chmod 555 dri"-})dnl
 __devitem(drm, drm*, {-Direct Rendering Manager-})dnl
 _mkdev(drm, drm*, {-M drm$U c major_drm_c $U 600
        r=Add($U, 128)

diff --git a/etc/etc.amd64/MAKEDEV.md b/etc/etc.amd64/MAKEDEV.md
index 3de86d5..c90f4a7 100644 (file)
--- a/etc/etc.amd64/MAKEDEV.md
+++ b/etc/etc.amd64/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,amd64)dnl
 vers(__file__,
-       {-$OpenBSD: MAKEDEV.md,v 1.77 2021/01/23 05:08:33 thfr Exp $-},
+       {-$OpenBSD: MAKEDEV.md,v 1.78 2021/02/12 10:26:33 jsg Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -71,6 +71,7 @@ _DEV(bktr, 49)
 _DEV(bpf, 23)
 _DEV(dt, 30)
 _DEV(diskmap, 90)
+_DEV(dri, 87)
 _DEV(drm, 87)
 _DEV(fdesc, 22)
 _DEV(fuse, 92)
@@ -136,6 +137,7 @@ target(all, vnd, 0, 1, 2, 3)dnl
 target(all, bktr, 0)dnl
 target(all, gpio, 0, 1, 2)dnl
 target(all, nvram)dnl
+target(all, dri)dnl
 target(all, drm, 0, 1, 2, 3)dnl
 target(all, ttyVI, 00, 10, 20, 30, 40)dnl
 target(all, ipmi, 0)dnl

diff --git a/etc/etc.amd64/fbtab b/etc/etc.amd64/fbtab
index 0369abc..70f13cc 100644 (file)
--- a/etc/etc.amd64/fbtab
+++ b/etc/etc.amd64/fbtab
@@ -1 +1 @@
-/dev/ttyC0     0600    /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128
+/dev/ttyC0     0600    /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128:/dev/dri/card0:/dev/dri/renderD128

diff --git a/etc/etc.arm64/MAKEDEV.md b/etc/etc.arm64/MAKEDEV.md
index bf71fb8..5ce3874 100644 (file)
--- a/etc/etc.arm64/MAKEDEV.md
+++ b/etc/etc.arm64/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,arm64)dnl
 vers(__file__,
-       {-$OpenBSD: MAKEDEV.md,v 1.11 2021/01/23 05:08:33 thfr Exp $-},
+       {-$OpenBSD: MAKEDEV.md,v 1.12 2021/02/12 10:26:34 jsg Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -63,6 +63,7 @@ _DEV(bktr, 49)
 _DEV(bpf, 23)
 _DEV(dt, 30)
 _DEV(diskmap, 90)
+_DEV(dri, 87)
 _DEV(drm, 87)
 _DEV(fdesc, 22)
 _DEV(fuse, 92)
@@ -115,6 +116,7 @@ target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, vnd, 0, 1, 2, 3)dnl
 target(all, bktr, 0)dnl
 target(all, gpio, 0, 1, 2)dnl
+target(all, dri)dnl
 target(all, drm, 0, 1, 2, 3)dnl
 target(all, ipmi, 0)dnl
 target(all, switch, 0, 1, 2, 3)dnl

diff --git a/etc/etc.arm64/fbtab b/etc/etc.arm64/fbtab
index cd12fe7..a0d4202 100644 (file)
--- a/etc/etc.arm64/fbtab
+++ b/etc/etc.arm64/fbtab
@@ -1,2 +1,2 @@
 /dev/tty00     0600    /dev/console
-/dev/ttyC0     0600    /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128
+/dev/ttyC0     0600    /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128:/dev/dri/card0:/dev/dri/renderD128

diff --git a/etc/etc.i386/MAKEDEV.md b/etc/etc.i386/MAKEDEV.md
index 2189d83..b6f6aad 100644 (file)
--- a/etc/etc.i386/MAKEDEV.md
+++ b/etc/etc.i386/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,i386)dnl
 vers(__file__,
-       {-$OpenBSD: MAKEDEV.md,v 1.92 2021/01/23 05:08:33 thfr Exp $-},
+       {-$OpenBSD: MAKEDEV.md,v 1.93 2021/02/12 10:26:34 jsg Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -73,6 +73,7 @@ _DEV(bktr, 49)
 _DEV(bpf, 23)
 _DEV(dt, 30)
 _DEV(diskmap, 91)
+_DEV(dri, 88)
 _DEV(drm, 88)
 _DEV(fdesc, 22)
 _DEV(fuse, 93)
@@ -137,6 +138,7 @@ target(all, vnd, 0, 1, 2, 3)dnl
 target(all, bktr, 0)dnl
 target(all, gpio, 0, 1, 2)dnl
 target(all, nvram)dnl
+target(all, dri)dnl
 target(all, drm, 0, 1, 2, 3)dnl
 target(all, amdmsr)dnl
 target(all, ipmi, 0)dnl

diff --git a/etc/etc.i386/fbtab b/etc/etc.i386/fbtab
index 0369abc..70f13cc 100644 (file)
--- a/etc/etc.i386/fbtab
+++ b/etc/etc.i386/fbtab
@@ -1 +1 @@
-/dev/ttyC0     0600    /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128
+/dev/ttyC0     0600    /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128:/dev/dri/card0:/dev/dri/renderD128

diff --git a/etc/etc.loongson/MAKEDEV.md b/etc/etc.loongson/MAKEDEV.md
index 7d72161..3f70186 100644 (file)
--- a/etc/etc.loongson/MAKEDEV.md
+++ b/etc/etc.loongson/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,loongson)dnl
 vers(__file__,
-       {-$OpenBSD: MAKEDEV.md,v 1.33 2021/01/23 05:08:33 thfr Exp $-},
+       {-$OpenBSD: MAKEDEV.md,v 1.34 2021/02/12 10:26:34 jsg Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -70,6 +70,7 @@ _DEV(bio, 49)
 _DEV(bpf, 12)
 _DEV(dt, 30)
 _DEV(diskmap, 70)
+_DEV(dri, 87)
 _DEV(drm, 87)
 _DEV(fdesc, 7)
 _DEV(fuse, 73)
@@ -110,6 +111,7 @@ target(all, cd, 0, 1)dnl
 target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, vnd, 0, 1, 2, 3)dnl
 target(all, switch, 0, 1, 2, 3)dnl
+target(all, dri)dnl
 target(all, drm, 0, 1, 2, 3)dnl
 target(ramd, pty, 0)dnl
 target(ramd, bio)dnl

diff --git a/etc/etc.loongson/fbtab b/etc/etc.loongson/fbtab
index cd12fe7..a0d4202 100644 (file)
--- a/etc/etc.loongson/fbtab
+++ b/etc/etc.loongson/fbtab
@@ -1,2 +1,2 @@
 /dev/tty00     0600    /dev/console
-/dev/ttyC0     0600    /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128
+/dev/ttyC0     0600    /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128:/dev/dri/card0:/dev/dri/renderD128

diff --git a/etc/etc.macppc/MAKEDEV.md b/etc/etc.macppc/MAKEDEV.md
index 7948c70..3b1ac11 100644 (file)
--- a/etc/etc.macppc/MAKEDEV.md
+++ b/etc/etc.macppc/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,macppc)dnl
 vers(__file__,
-       {-$OpenBSD: MAKEDEV.md,v 1.76 2021/01/23 05:08:33 thfr Exp $-},
+       {-$OpenBSD: MAKEDEV.md,v 1.77 2021/02/12 10:26:34 jsg Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -81,6 +81,7 @@ _DEV(bktr, 75)
 _DEV(bpf, 22)
 _DEV(dt, 30)
 _DEV(diskmap, 84)
+_DEV(dri, 87)
 _DEV(drm, 87)
 _DEV(fdesc, 21)
 _DEV(fuse, 88)
@@ -130,6 +131,7 @@ target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, vnd, 0, 1, 2, 3)dnl
 target(all, gpio, 0, 1, 2)dnl
 target(all, bio)dnl
+target(all, dri)dnl
 target(all, drm, 0, 1, 2, 3)dnl
 target(all, switch, 0, 1, 2, 3)dnl
 target(ramd, ttya, 0, 1)dnl

diff --git a/etc/etc.macppc/fbtab b/etc/etc.macppc/fbtab
index 54ea437..29a54e9 100644 (file)
--- a/etc/etc.macppc/fbtab
+++ b/etc/etc.macppc/fbtab
@@ -1,3 +1,3 @@
 /dev/ttya      0600    /dev/console
 /dev/tty00     0600    /dev/console
-/dev/ttyC0     0600    /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128
+/dev/ttyC0     0600    /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128:/dev/dri/card0:/dev/dri/renderD128

diff --git a/etc/etc.powerpc64/MAKEDEV.md b/etc/etc.powerpc64/MAKEDEV.md
index 12dbee3..408fde7 100644 (file)
--- a/etc/etc.powerpc64/MAKEDEV.md
+++ b/etc/etc.powerpc64/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,powerpc64)dnl
 vers(__file__,
-       {-$OpenBSD: MAKEDEV.md,v 1.7 2021/01/23 05:08:33 thfr Exp $-},
+       {-$OpenBSD: MAKEDEV.md,v 1.8 2021/02/12 10:26:34 jsg Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -60,6 +60,7 @@ _DEV(au, 32)
 _DEV(bio, 80)
 _DEV(bpf, 9)
 _DEV(diskmap, 10)
+_DEV(dri, 87)
 _DEV(drm, 87)
 _DEV(dt, 13)
 _DEV(fdesc, 8)
@@ -103,6 +104,7 @@ twrget(all, au, audio, 0, 1, 2, 3)dnl
 target(all, bio)dnl
 target(all, cd, 0, 1)dnl
 target(all, diskmap)dnl
+target(all, dri)dnl
 target(all, drm, 0, 1, 2, 3)dnl
 target(all, ipmi, 0)dnl
 target(all, pty, 0)dnl

diff --git a/etc/etc.sparc64/MAKEDEV.md b/etc/etc.sparc64/MAKEDEV.md
index 930f717..6f270e0 100644 (file)
--- a/etc/etc.sparc64/MAKEDEV.md
+++ b/etc/etc.sparc64/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,sparc64)dnl
 vers(__file__,
-       {-$OpenBSD: MAKEDEV.md,v 1.96 2021/01/23 05:08:33 thfr Exp $-},
+       {-$OpenBSD: MAKEDEV.md,v 1.97 2021/02/12 10:26:34 jsg Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -112,6 +112,7 @@ _DEV(au, 69)
 _DEV(bio, 120)
 _DEV(bpf, 105)
 _DEV(diskmap, 130)
+_DEV(dri, 87)
 _DEV(drm, 87)
 _DEV(fdesc, 24)
 _DEV(dt, 30)
@@ -176,6 +177,7 @@ target(all, cd, 0, 1)dnl
 target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, vnd, 0, 1, 2, 3)dnl
 target(all, bpp, 0)dnl
+target(all, dri)dnl
 target(all, drm, 0, 1, 2, 3)dnl
 target(all, switch, 0, 1, 2, 3)dnl
 twrget(all, s64_tzs, tty, a, b, c, d)dnl

diff --git a/etc/etc.sparc64/fbtab b/etc/etc.sparc64/fbtab
index 8e9c6bb..2c3c1c3 100644 (file)
--- a/etc/etc.sparc64/fbtab
+++ b/etc/etc.sparc64/fbtab
@@ -1 +1 @@
-/dev/console   0600    /dev/ttyC0:/dev/ttyD0:/dev/ttyE0:/dev/ttyF0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/tty00:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128
+/dev/console   0600    /dev/ttyC0:/dev/ttyD0:/dev/ttyE0:/dev/ttyF0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/tty00:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128:/dev/dri/card0:/dev/dri/renderD128