Module Name: src
Committed By: snj
Date: Sun Jan 11 06:29:15 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon [netbsd-7]: radeon_ttm.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #404):
sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c: revision 1.6
apply a patch from rjs@, which is necessary for radeondrmkms on i386:
set DRM_FILE_PAGE_OFFSET to 0xa0000000UL for 32 bit platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
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/drm/radeon/radeon_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.5.4.1
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.5 Sat Jul 26 21:19:45 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c Sun Jan 11 06:29:15 2015
@@ -50,7 +50,11 @@
#include <drm/bus_dma_hacks.h>
#endif
+#ifdef _LP64
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
+#else
+#define DRM_FILE_PAGE_OFFSET (0xa0000000UL >> PAGE_SHIFT)
+#endif
static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
static void radeon_ttm_debugfs_fini(struct radeon_device *rdev);
