CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: maya Date: Sun Apr 19 17:49:42 UTC 2020 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: Include dev/sysmon/sysmonvar.h for sysmon_pswitch. Somehow only triggered by the compat build (which shouldn't have been enabled!) To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/external/bsd/drm2/dist/include/drm/drmP.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/drmP.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.40 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.41 --- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.40 Sun Apr 19 17:19:13 2020 +++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Apr 19 17:49:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: drmP.h,v 1.40 2020/04/19 17:19:13 maya Exp $ */ +/* $NetBSD: drmP.h,v 1.41 2020/04/19 17:49:41 maya Exp $ */ /* * Internal Header for the Direct Rendering Manager @@ -67,6 +67,7 @@ #include #ifdef __NetBSD__ +#include #include #include #include
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: jmcneill Date: Sun Jan 19 16:12:00 UTC 2020 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_cache.h Log Message: Pull in drm_os_netbsd.h for CONFIG_ defines To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/include/drm/drm_cache.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_cache.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h:1.4 --- src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h:1.3 Sun Jan 19 12:03:27 2020 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h Sun Jan 19 16:12:00 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_cache.h,v 1.3 2020/01/19 12:03:27 jmcneill Exp $ */ +/* $NetBSD: drm_cache.h,v 1.4 2020/01/19 16:12:00 jmcneill Exp $ */ /** * @@ -35,6 +35,10 @@ #ifndef _DRM_CACHE_H_ #define _DRM_CACHE_H_ +#ifdef __NetBSD__ +#include +#endif + void drm_clflush_pages(struct page *pages[], unsigned long num_pages); static inline bool drm_arch_can_wc_memory(void)
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: jmcneill
Date: Sat Oct 17 16:17:22 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_agpsupport.h
Log Message:
fix __OS_HAS_AGP=0 build
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.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_agpsupport.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h:1.4 src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h:1.5
--- src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h:1.4 Sat Nov 22 19:18:07 2014
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h Sat Oct 17 16:17:22 2015
@@ -53,6 +53,8 @@ int drm_agp_bind_ioctl(struct drm_device
struct drm_file *file_priv);
#else /* __OS_HAS_AGP */
+#if !defined(__NetBSD__)
+
static inline void drm_free_agp(struct agp_memory * handle, int pages)
{
}
@@ -67,6 +69,8 @@ static inline int drm_unbind_agp(struct
return -ENODEV;
}
+#endif
+
static inline struct agp_memory *drm_agp_bind_pages(struct drm_device *dev,
struct page **pages,
unsigned long num_pages,
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Thu Mar 5 08:36:54 UTC 2020 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: Hackily rename enum pipe for drm, without patching. The patch we used to maintain to do this rename doubled the pain of merging drm updates. But ctf gets confused if we have a struct and an enum both called `pipe', and it's technically against C99 to do so. So #define it in all drm code for now to fix dtrace. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/dist/include/drm/drmP.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/drmP.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.38 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.39 --- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.38 Thu Mar 5 07:46:59 2020 +++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Thu Mar 5 08:36:53 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: drmP.h,v 1.38 2020/03/05 07:46:59 riastradh Exp $ */ +/* $NetBSD: drmP.h,v 1.39 2020/03/05 08:36:53 riastradh Exp $ */ /* * Internal Header for the Direct Rendering Manager @@ -81,6 +81,28 @@ #include #include #include + +/* + * NetBSD already has struct pipe, and according to C99 6.2.3 there's + * only one namespace for struct, union, and enum tags, but the i915 + * driver wants a type called enum pipe. + * + * So rename it to avoid conflicts which confuse tools like ctfmerge -- + * but make sure we include first to avoid having two + * different versions of struct file, one with a pointer to struct pipe + * and another with a pointer to struct i915_pipe. + * + * This will cause trouble if we ever have an API that involves `pipe' + * as a member which we need to reference from within drm code. But + * for now that is not the case. + * + * XXX Yes, this is disgusting. Sorry. + */ +#if defined(__i386__) || defined(__x86_64__) +#include +#define pipe pipe_drmhack +#endif + #else #include #endif
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 15:28:03 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
Log Message:
Clarify what bus_dmat and dmat are.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/dist/include/drm/drmP.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/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.29 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.30
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.29 Mon Aug 27 15:26:50 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Mon Aug 27 15:28:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.29 2018/08/27 15:26:50 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.30 2018/08/27 15:28:03 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -919,8 +919,8 @@ struct drm_device {
bus_space_tag_t bst;
struct drm_bus_map *bus_maps;
unsigned bus_nmaps;
- bus_dma_tag_t bus_dmat;
- bus_dma_tag_t dmat;
+ bus_dma_tag_t bus_dmat; /* bus's full DMA tag, for internal use */
+ bus_dma_tag_t dmat; /* DMA tag for driver, may be subregion */
bool dmat_subregion_p;
bus_addr_t dmat_subregion_min;
bus_addr_t dmat_subregion_max;
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 06:18:05 UTC 2018 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_legacy.h Log Message: provide missing declarations add missing headers Author: coypu Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.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_legacy.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.2 src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.3 --- src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.2 Mon Aug 27 04:58:37 2018 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h Mon Aug 27 06:18:05 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_legacy.h,v 1.2 2018/08/27 04:58:37 riastradh Exp $ */ +/* $NetBSD: drm_legacy.h,v 1.3 2018/08/27 06:18:05 riastradh Exp $ */ #ifndef __DRM_DRM_LEGACY_H__ #define __DRM_DRM_LEGACY_H__ @@ -36,6 +36,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include + +struct drm_lock_data; /* * Legacy Support for palateontologic DRM drivers
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 06:39:17 UTC 2018 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_legacy.h Log Message: Apparently needs for struct drm_device. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.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_legacy.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.4 --- src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.3 Mon Aug 27 06:18:05 2018 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h Mon Aug 27 06:39:16 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_legacy.h,v 1.3 2018/08/27 06:18:05 riastradh Exp $ */ +/* $NetBSD: drm_legacy.h,v 1.4 2018/08/27 06:39:16 riastradh Exp $ */ #ifndef __DRM_DRM_LEGACY_H__ #define __DRM_DRM_LEGACY_H__ @@ -36,6 +36,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include #include struct drm_lock_data;
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 06:39:05 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
Log Message:
drm_crtc_vblank_waitqueue has to have a sane type.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/dist/include/drm/drmP.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/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.15 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.16
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.15 Mon Aug 27 06:17:30 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Mon Aug 27 06:39:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.15 2018/08/27 06:17:30 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.16 2018/08/27 06:39:05 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -1079,7 +1079,11 @@ extern void drm_calc_timestamping_consta
* This function returns a pointer to the vblank waitqueue for the CRTC.
* Drivers can use this to implement vblank waits using wait_event() & co.
*/
+#ifdef __NetBSD__
+static inline drm_waitqueue_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc)
+#else
static inline wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc)
+#endif
{
return &crtc->dev->vblank[drm_crtc_index(crtc)].queue;
}
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 06:42:00 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
Log Message:
Ifdef out gem_prime_mmap for now.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/dist/include/drm/drmP.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/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.16 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.17
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.16 Mon Aug 27 06:39:05 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Mon Aug 27 06:42:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.16 2018/08/27 06:39:05 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.17 2018/08/27 06:42:00 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -656,8 +656,10 @@ struct drm_driver {
struct sg_table *sgt);
void *(*gem_prime_vmap)(struct drm_gem_object *obj);
void (*gem_prime_vunmap)(struct drm_gem_object *obj, void *vaddr);
+#ifndef __NetBSD__ /* XXX drm prime */
int (*gem_prime_mmap)(struct drm_gem_object *obj,
struct vm_area_struct *vma);
+#endif
/* vga arb irq handler */
void (*vgaarb_irq)(struct drm_device *dev, bool state);
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 06:42:41 UTC 2018 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: Include drm_os_* earlier. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/dist/include/drm/drmP.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/drmP.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.17 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.18 --- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.17 Mon Aug 27 06:42:00 2018 +++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Mon Aug 27 06:42:41 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drmP.h,v 1.17 2018/08/27 06:42:00 riastradh Exp $ */ +/* $NetBSD: drmP.h,v 1.18 2018/08/27 06:42:41 riastradh Exp $ */ /* * Internal Header for the Direct Rendering Manager @@ -72,6 +72,12 @@ #include #include +#ifdef __NetBSD__ +#include +#else +#include +#endif + #include #include #include @@ -79,11 +85,6 @@ #include #include #include -#ifdef __NetBSD__ -#include -#else -#include -#endif #include #include
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 06:44:42 UTC 2018 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_dp_mst_helper.h Log Message: ifdef CONFIG_DEBUG_FS To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/include/drm/drm_dp_mst_helper.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_dp_mst_helper.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_dp_mst_helper.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_dp_mst_helper.h:1.4 --- src/sys/external/bsd/drm2/dist/include/drm/drm_dp_mst_helper.h:1.3 Mon Aug 27 06:06:41 2018 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_dp_mst_helper.h Mon Aug 27 06:44:41 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_dp_mst_helper.h,v 1.3 2018/08/27 06:06:41 riastradh Exp $ */ +/* $NetBSD: drm_dp_mst_helper.h,v 1.4 2018/08/27 06:44:41 riastradh Exp $ */ /* * Copyright © 2014 Red Hat. @@ -510,8 +510,10 @@ int drm_dp_update_payload_part2(struct d int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr); +#ifdef CONFIG_DEBUG_FS void drm_dp_mst_dump_topology(struct seq_file *m, struct drm_dp_mst_topology_mgr *mgr); +#endif void drm_dp_mst_topology_mgr_suspend(struct drm_dp_mst_topology_mgr *mgr); int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr);
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 06:46:02 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_crtc.h
Log Message:
Unconstify a kmemduped thing.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.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_crtc.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h:1.6 src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h:1.7
--- src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h:1.6 Mon Aug 27 04:58:37 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h Mon Aug 27 06:46:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_crtc.h,v 1.6 2018/08/27 04:58:37 riastradh Exp $ */
+/* $NetBSD: drm_crtc.h,v 1.7 2018/08/27 06:46:02 riastradh Exp $ */
/*
* Copyright © 2006 Keith Packard
@@ -146,7 +146,7 @@ struct drm_display_info {
enum subpixel_order subpixel_order;
u32 color_formats;
- const u32 *bus_formats;
+ u32 *bus_formats;
unsigned int num_bus_formats;
/* Mask of supported hdmi deep color modes */
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 06:44:53 UTC 2018 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_dp_helper.h drm_dp_mst_helper.h Log Message: Include some necessary header files. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/include/drm/drm_dp_mst_helper.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_dp_helper.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h:1.2 src/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h:1.3 --- src/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h:1.2 Mon Aug 27 04:58:37 2018 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h Mon Aug 27 06:44:53 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_dp_helper.h,v 1.2 2018/08/27 04:58:37 riastradh Exp $ */ +/* $NetBSD: drm_dp_helper.h,v 1.3 2018/08/27 06:44:53 riastradh Exp $ */ /* * Copyright © 2008 Keith Packard @@ -28,6 +28,7 @@ #include #include #include +#include /* * Unless otherwise noted, all values are from the DP 1.1a spec. Note that Index: src/sys/external/bsd/drm2/dist/include/drm/drm_dp_mst_helper.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_dp_mst_helper.h:1.4 src/sys/external/bsd/drm2/dist/include/drm/drm_dp_mst_helper.h:1.5 --- src/sys/external/bsd/drm2/dist/include/drm/drm_dp_mst_helper.h:1.4 Mon Aug 27 06:44:41 2018 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_dp_mst_helper.h Mon Aug 27 06:44:53 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_dp_mst_helper.h,v 1.4 2018/08/27 06:44:41 riastradh Exp $ */ +/* $NetBSD: drm_dp_mst_helper.h,v 1.5 2018/08/27 06:44:53 riastradh Exp $ */ /* * Copyright © 2014 Red Hat. @@ -24,7 +24,11 @@ #ifndef _DRM_DP_MST_HELPER_H_ #define _DRM_DP_MST_HELPER_H_ +#include +#include +#include #include +#include #include struct drm_dp_mst_branch;
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 07:44:52 UTC 2018 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_agpsupport.h Log Message: Include order got shuffled. Include drm_agp_netbsd.h explicitly. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.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_agpsupport.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h:1.6 src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h:1.7 --- src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h:1.6 Mon Aug 27 04:58:37 2018 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h Mon Aug 27 07:44:52 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_agpsupport.h,v 1.6 2018/08/27 04:58:37 riastradh Exp $ */ +/* $NetBSD: drm_agpsupport.h,v 1.7 2018/08/27 07:44:52 riastradh Exp $ */ #ifndef _DRM_AGPSUPPORT_H_ #define _DRM_AGPSUPPORT_H_ @@ -11,6 +11,10 @@ #include #include +#ifdef __NetBSD__ +#include +#endif + struct drm_device; struct drm_file;
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 07:46:07 UTC 2018 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_legacy.h Log Message: Move drm_limit_dma_space to drmP.h -- not legacy, used by drivers. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/dist/include/drm/drmP.h cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.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/drmP.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.22 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.23 --- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.22 Mon Aug 27 07:03:26 2018 +++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Mon Aug 27 07:46:07 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drmP.h,v 1.22 2018/08/27 07:03:26 riastradh Exp $ */ +/* $NetBSD: drmP.h,v 1.23 2018/08/27 07:46:07 riastradh Exp $ */ /* * Internal Header for the Direct Rendering Manager @@ -1207,6 +1207,10 @@ int drm_dev_set_unique(struct drm_device struct drm_minor *drm_minor_acquire(unsigned int minor_id); void drm_minor_release(struct drm_minor *minor); +#ifdef __NetBSD__ +int drm_limit_dma_space(struct drm_device *, resource_size_t, resource_size_t); +#endif + /*@}*/ /* PCI section */ Index: src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.5 src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.6 --- src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.5 Mon Aug 27 06:42:54 2018 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h Mon Aug 27 07:46:07 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_legacy.h,v 1.5 2018/08/27 06:42:54 riastradh Exp $ */ +/* $NetBSD: drm_legacy.h,v 1.6 2018/08/27 07:46:07 riastradh Exp $ */ #ifndef __DRM_DRM_LEGACY_H__ #define __DRM_DRM_LEGACY_H__ @@ -252,9 +252,6 @@ void drm_legacy_idlelock_release(struct void __drm_legacy_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); /* drm_memory.c */ -#ifdef __NetBSD__ -int drm_limit_dma_space(struct drm_device *, resource_size_t, resource_size_t); -#endif void drm_legacy_ioremap(struct drm_local_map *map, struct drm_device *dev); void drm_legacy_ioremap_wc(struct drm_local_map *map, struct drm_device *dev); void drm_legacy_ioremapfree(struct drm_local_map *map, struct drm_device *dev);
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Mon Aug 27 13:36:33 UTC 2018 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h Log Message: Update comment to reflect reality. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/drm2/dist/include/drm/drmP.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/drmP.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.23 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.24 --- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.23 Mon Aug 27 07:46:07 2018 +++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Mon Aug 27 13:36:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drmP.h,v 1.23 2018/08/27 07:46:07 riastradh Exp $ */ +/* $NetBSD: drmP.h,v 1.24 2018/08/27 13:36:32 riastradh Exp $ */ /* * Internal Header for the Direct Rendering Manager @@ -1173,7 +1173,7 @@ extern int drm_gem_prime_fd_to_handle(st struct drm_file *file_priv, int prime_fd, uint32_t *handle); extern void drm_gem_dmabuf_release(struct dma_buf *dma_buf); -#ifndef __NetBSD__ /* XXX temporary measure 20130212 */ +#ifndef __NetBSD__ /* XXX drm prime */ extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages, dma_addr_t *addrs, int max_pages); extern struct sg_table *drm_prime_pages_to_sg(struct page **pages, unsigned int nr_pages);
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 14:39:59 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_modeset_lock.h
Log Message:
Call ww_mutex_destroy in drm_modeset_lock_fini.
>From mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.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_modeset_lock.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h:1.4
--- src/sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h:1.3 Mon Aug 27 06:17:52 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h Mon Aug 27 14:39:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_modeset_lock.h,v 1.3 2018/08/27 06:17:52 riastradh Exp $ */
+/* $NetBSD: drm_modeset_lock.h,v 1.4 2018/08/27 14:39:59 riastradh Exp $ */
/*
* Copyright (C) 2014 Red Hat
@@ -111,6 +111,7 @@ static inline void drm_modeset_lock_init
static inline void drm_modeset_lock_fini(struct drm_modeset_lock *lock)
{
WARN_ON(!list_empty(&lock->head));
+ ww_mutex_destroy(&lock->mutex);
}
/**
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Thu Apr 3 14:55:53 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_mm.h
Log Message:
Nix accidental whitespace to reduce diff from Linux.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_mm.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_mm.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_mm.h:1.2 src/sys/external/bsd/drm2/dist/include/drm/drm_mm.h:1.3
--- src/sys/external/bsd/drm2/dist/include/drm/drm_mm.h:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_mm.h Thu Apr 3 14:55:53 2014
@@ -90,7 +90,6 @@ static inline bool drm_mm_initialized(st
{
return mm->hole_stack.next;
}
-
#define drm_mm_for_each_node(entry, mm) list_for_each_entry(entry, \
&(mm)->head_node.node_list, \
node_list)
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: christos Date: Tue Nov 11 02:49:16 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_agpsupport.h Log Message: add drm_agp_destroy To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.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_agpsupport.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h:1.2 src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h:1.3 --- src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h:1.2 Wed Jul 16 16:56:25 2014 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h Mon Nov 10 21:49:16 2014 @@ -27,6 +27,7 @@ struct agp_memory *drm_agp_bind_pages(st struct drm_agp_head *drm_agp_init(struct drm_device *dev); void drm_agp_clear(struct drm_device *dev); +void drm_agp_destroy(struct drm_device *dev); int drm_agp_acquire(struct drm_device *dev); int drm_agp_acquire_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv);
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src Committed By: riastradh Date: Thu Mar 5 17:24:36 UTC 2015 Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drm_crtc.h drm_modes.h Log Message: Include some necessary header files and forward declarations. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/include/drm/drm_modes.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_crtc.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h:1.4 --- src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h:1.3 Wed Jul 16 20:03:56 2014 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h Thu Mar 5 17:24:36 2015 @@ -31,6 +31,9 @@ #include #include #include +#include +#include +#include #include #include Index: src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h:1.2 src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h:1.3 --- src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h:1.2 Wed Jul 16 20:03:56 2014 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_modes.h Thu Mar 5 17:24:36 2015 @@ -27,6 +27,11 @@ #ifndef __DRM_MODES_H__ #define __DRM_MODES_H__ +#include + +struct device_node; +struct videomode; + /* * Note on terminology: here, for brevity and convenience, we refer to connector * control chips as 'CRTCs'. They can control any type of connector, VGA, LVDS,
CVS commit: src/sys/external/bsd/drm2/dist/include/drm
Module Name:src
Committed By: riastradh
Date: Wed Apr 29 17:36:09 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_pciids.h
Log Message:
Add Chrome9 HC IGP to viadrm device ids.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/include/drm/drm_pciids.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_pciids.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_pciids.h:1.1.1.1 src/sys/external/bsd/drm2/dist/include/drm/drm_pciids.h:1.2
--- src/sys/external/bsd/drm2/dist/include/drm/drm_pciids.h:1.1.1.1 Wed Jul 16 19:35:30 2014
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_pciids.h Wed Apr 29 17:36:09 2015
@@ -769,6 +769,7 @@
{0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
{0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \
+ {0x1106, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
{0, 0, 0}
#define i810_PCI_IDS \
