Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/include/drm drm: Omit local diff ...



details:   https://anonhg.NetBSD.org/src/rev/22090dc7f387
branches:  trunk
changeset: 1029122:22090dc7f387
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Dec 22 12:05:24 2021 +0000

description:
drm: Omit local diff -- vmem is entirely a NetBSDism.

Use struct vmem rather than vmem_t to obviate need for header file
dependency.

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drm_device.h |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (31 lines):

diff -r 6b6650110431 -r 22090dc7f387 sys/external/bsd/drm2/dist/include/drm/drm_device.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_device.h       Wed Dec 22 07:28:34 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_device.h       Wed Dec 22 12:05:24 2021 +0000
@@ -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 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 @@
        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 */



Home | Main Index | Thread Index | Old Index