From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from wolverine01.qualcomm.com ([199.106.114.254]:55934 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751201Ab0E0TlO (ORCPT ); Thu, 27 May 2010 15:41:14 -0400 From: jcrouse@codeaurora.org Subject: [PATCH 4/4] drm: Make sure the DRM offset matches the CPU Date: Thu, 27 May 2010 13:40:27 -0600 Message-Id: <1274989227-11669-5-git-send-email-jcrouse@codeaurora.org> In-Reply-To: <4B8BE489.7020402@codeaurora.org> References: <4B8BE489.7020402@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org List-ID: To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, Jordan Crouse From: Jordan Crouse 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 --- 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 33dad3f..8601b72 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 -- 1.7.0.1