Module Name: src
Committed By: riastradh
Date: Wed Dec 22 12:05:24 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_device.h
Log Message:
drm: Omit local diff -- vmem is entirely a NetBSDism.
Use struct vmem rather than vmem_t to obviate need for header file
dependency.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm2/dist/include/drm/drm_device.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_device.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_device.h:1.9 src/sys/external/bsd/drm2/dist/include/drm/drm_device.h:1.10
--- src/sys/external/bsd/drm2/dist/include/drm/drm_device.h:1.9 Tue Dec 21 12:28:34 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_device.h Wed Dec 22 12:05:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_device.h,v 1.9 2021/12/21 12:28:34 tnn Exp $ */
+/* $NetBSD: drm_device.h,v 1.10 2021/12/22 12:05:24 riastradh Exp $ */
#ifndef _DRM_DEVICE_H_
#define _DRM_DEVICE_H_
@@ -29,12 +29,6 @@ struct drm_fb_helper;
struct pci_dev;
struct pci_controller;
-#if defined(__NetBSD__)
-#include <sys/vmem.h>
-#else
-typedef struct vmem vmem_t;
-#endif
-
/**
* enum drm_switch_power - power state of drm device
*/
@@ -297,7 +291,7 @@ struct drm_device {
bool dmat_subregion_p;
bus_addr_t dmat_subregion_min;
bus_addr_t dmat_subregion_max;
- vmem_t *cma_pool;
+ struct vmem *cma_pool;
#endif
/** @num_crtcs: Number of CRTCs on this device */
