diff options
Diffstat (limited to 'sys/dev/pci/drm')
| -rw-r--r-- | sys/dev/pci/drm/drmP.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/drm_atomic.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h index 0d951fb9fb4..e2ca5e3e3b0 100644 --- a/sys/dev/pci/drm/drmP.h +++ b/sys/dev/pci/drm/drmP.h @@ -130,6 +130,10 @@ typedef struct drm_file drm_file_t; #include "drm_linux_list.h" #include "drm_atomic.h" +#ifdef __amd64__ +#define DRM_NO_MTRR +#endif /* Until the mtrr apis are merged. */ + #if defined(__FreeBSD__) || defined(__NetBSD__) #include <opt_drm.h> #endif diff --git a/sys/dev/pci/drm/drm_atomic.h b/sys/dev/pci/drm/drm_atomic.h index 08ac224d3fd..01042c6c43e 100644 --- a/sys/dev/pci/drm/drm_atomic.h +++ b/sys/dev/pci/drm/drm_atomic.h @@ -65,7 +65,7 @@ typedef u_int32_t atomic_t; #endif /* !__FreeBSD__ */ #if !defined(__FreeBSD_version) || (__FreeBSD_version < 500000) -#if defined(__i386__) +#if defined(__i386__) || defined(__amd64__) /* The extra atomic functions from 5.0 haven't been merged to 4.x */ static __inline int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) |