Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm: Fix conditionals around drmkms_pci and agp. 

Kernel should build now with all pci drm drivers stripped out but
DRM_LEGACY still enabled.  (Might not be very useful, but it'll
build.  Maybe we should also have DRM_LEGACY_PCI so those drivers can
be modloaded later.)
This commit is contained in:
riastradh 2023-09-05 20:15:10 +00:00
parent d853547a48
commit ee3f67d30d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/external/bsd/drm2/drm/drm_module.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: drm_module.c,v 1.31 2022/07/19 22:24:47 riastradh Exp $ */
/* $NetBSD: drm_module.c,v 1.32 2023/09/05 20:15:10 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.31 2022/07/19 22:24:47 riastradh Exp $");
__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.32 2023/09/05 20:15:10 riastradh Exp $");
#include <sys/types.h>
#include <sys/condvar.h>
@ -89,6 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.31 2022/07/19 22:24:47 riastradh Ex
*/
#if defined(__powerpc__) || defined(__i386__) || defined(__x86_64__)
#include "agp.h"
#include "drmkms_pci.h"
#endif
/*
@ -114,7 +115,7 @@ drm_init(void)
drm_core_init_complete = true;
drm_agp_hooks_init();
#if NAGP > 0
#if NDRMKMS_PCI > 0 && NAGP > 0
extern int drmkms_agp_guarantee_initialized(void);
error = drmkms_agp_guarantee_initialized();
if (error) {

4
sys/external/bsd/drm2/pci/files.drmkms_pci vendored
View File

@ -1,11 +1,11 @@
# $NetBSD: files.drmkms_pci,v 1.17 2022/07/19 23:19:07 riastradh Exp $
# $NetBSD: files.drmkms_pci,v 1.18 2023/09/05 20:15:10 riastradh Exp $
define drmkms_pci: drmkms
makeoptions drmkms_pci "CPPFLAGS.drmkms_pci"+="${CPPFLAGS.drmkms}"
#file external/bsd/drm2/dist/drm/ati_pcigart.c drmkms_pci
file external/bsd/drm2/dist/drm/drm_agpsupport.c drmkms_pci & agp
file external/bsd/drm2/dist/drm/drm_agpsupport.c drmkms_pci & agp needs-flag
file external/bsd/drm2/pci/drm_pci.c drmkms_pci
file external/bsd/drm2/pci/drm_pci_module.c drmkms_pci