drm: updated DRM map patch for 32/64 bit systems

I basically combined Paul's patches with additions that I had made
for PCI scatter gather.
I also tried more carefully to avoid problems with the same token
assigned multiple times while trying to use the base address in the
token if possible to gain as much backward compatibility as possible
for broken DRI clients.

From: Paul Mackerras <paulus@samba.org> and Egbert Eich <eich@suse.de>
Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/char/drm/ffb_drv.c b/drivers/char/drm/ffb_drv.c
index ec614fff8f04..1bd0d55ee0f0 100644
--- a/drivers/char/drm/ffb_drv.c
+++ b/drivers/char/drm/ffb_drv.c
@@ -152,14 +152,11 @@ static drm_map_t *ffb_find_map(struct file *filp, unsigned long off)
                 return NULL;
 
         list_for_each(list, &dev->maplist->head) {
-                unsigned long uoff;
-
                 r_list = (drm_map_list_t *)list;
                 map = r_list->map;
                 if (!map)
                         continue;
-                uoff = (map->offset & 0xffffffff);
-                if (uoff == off)
+                if (r_list->user_token == off)
                         return map;
         }