From b2fd7eeb005d0a6a64af5e81b5b9da544f88e44c Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Tue, 29 Jun 2021 01:42:14 +0000
Subject: [PATCH] move some config lines to ensure drm.h is always created

ok deraadt@ kettenis@
---
 sys/conf/files            | 11 +++++++----
 sys/dev/pci/drm/files.drm |  7 +------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index 0f3b790d3c0..8ec908f3918 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.702 2021/04/16 08:17:35 stsp Exp $
+#	$OpenBSD: files,v 1.703 2021/06/29 01:42:14 jsg Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -96,11 +96,14 @@ file	dev/ic/mk48txx.c		mk48txx
 # agp integrated graphics attaches at vga. defines are in dev/pci/files.agp
 define agpint {}
 
-# DRM - Direct Rendering Manager: /dev/drm
-define drmdev {}
+# DRM - Direct Rendering Manager: /dev/dri/
+define drmbase {[primary = -1]}
+device drm: drmbase
+attach drm at drmbase
+file	dev/pci/drm/drm_drv.c		drm	needs-flag
 
 # VGA graphics
-device	vga: wsemuldisplaydev, pcdisplayops, drmdev, agpint
+device	vga: wsemuldisplaydev, pcdisplayops, agpint
 file	dev/ic/vga.c			vga & (vga_pci | vga_isa) needs-flag
 file	dev/ic/vga_subr.c		vga & (vga_pci | vga_isa) needs-flag
 
diff --git a/sys/dev/pci/drm/files.drm b/sys/dev/pci/drm/files.drm
index 28fdf6a8c12..01a0dbc94c3 100644
--- a/sys/dev/pci/drm/files.drm
+++ b/sys/dev/pci/drm/files.drm
@@ -1,10 +1,6 @@
 # $NetBSD: files.drm,v 1.2 2007/03/28 11:29:37 jmcneill Exp $
-# $OpenBSD: files.drm,v 1.50 2020/10/25 09:43:46 kettenis Exp $
+# $OpenBSD: files.drm,v 1.51 2021/06/29 01:42:14 jsg Exp $
 
-# direct rendering modules
-define drmbase {[primary = -1]}
-device drm: drmbase
-attach drm at drmbase
 file	dev/pci/drm/dma-resv.c			drm
 file	dev/pci/drm/drm_agpsupport.c		drm & agp
 file	dev/pci/drm/drm_atomic.c		drm
@@ -31,7 +27,6 @@ file	dev/pci/drm/drm_damage_helper.c		drm
 file	dev/pci/drm/drm_dp_dual_mode_helper.c	drm
 file	dev/pci/drm/drm_dp_helper.c		drm
 file	dev/pci/drm/drm_dp_mst_topology.c	drm
-file	dev/pci/drm/drm_drv.c			drm	needs-flag
 file	dev/pci/drm/drm_dsc.c			drm
 file	dev/pci/drm/drm_dumb_buffers.c		drm
 file	dev/pci/drm/drm_edid.c			drm
-- 
2.20.1