diff options
| author | Jordan Crouse <jcrouse@codeaurora.org> | 2010-08-04 14:48:26 -0600 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2010-10-19 16:39:24 +0200 |
| commit | 3b54317dea5b5f7957729a71286d817c1a0211c9 (patch) | |
| tree | 350c6f764783229663ecd0048efc9998806d7686 | |
| parent | 2854daa582be40c1616b2e41773248587f8555ff (diff) | |
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 at codeaurora.org>
Signed-off-by: Jeff McGee <j-mcgee@ti.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 33dad3fa6043..8601b72b6f26 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 |