diff options
| author | Jordan Crouse <jcrouse@codeaurora.org> | 2010-05-27 13:40:27 -0600 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-06-01 10:07:57 +1000 |
| commit | 05269a3a5a78bb074413de495105d7a2686c4529 (patch) | |
| tree | 85f0000bdb5708079309f8ff42ecc55896c3d445 | |
| parent | 4b7fb9b5746554d460e7bc986341d4b2db01e0b6 (diff) | |
| download | linux-3.10-05269a3a5a78bb074413de495105d7a2686c4529.tar.gz linux-3.10-05269a3a5a78bb074413de495105d7a2686c4529.tar.bz2 linux-3.10-05269a3a5a78bb074413de495105d7a2686c4529.zip | |
drm: Make sure the DRM offset matches the CPU
The pgoff option in mmap() is defined as an unsigned long
so the offset generated by DRM needs to fit into
BITS_PER_LONG for the CPU in question.
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_gem.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 33dad3fa604..8601b72b6f2 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -68,8 +68,18 @@ * We make up offsets for buffer objects so we can recognize them at * mmap time. */ + +/* pgoff in mmap is an unsigned long, so we need to make sure that + * the faked up offset will fit + */ + +#if BITS_PER_LONG == 64 #define DRM_FILE_PAGE_OFFSET_START ((0xFFFFFFFFUL >> PAGE_SHIFT) + 1) #define DRM_FILE_PAGE_OFFSET_SIZE ((0xFFFFFFFFUL >> PAGE_SHIFT) * 16) +#else +#define DRM_FILE_PAGE_OFFSET_START ((0xFFFFFFFUL >> PAGE_SHIFT) + 1) +#define DRM_FILE_PAGE_OFFSET_SIZE ((0xFFFFFFFUL >> PAGE_SHIFT) * 16) +#endif /** * Initialize the GEM device fields |