Revert "drm: don't associate _DRM_DRIVER maps with a master"
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jun 2009 17:21:52 +0000 (10:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jun 2009 17:21:52 +0000 (10:21 -0700)
This reverts commit 6c51d1cfa0a370b48a157163340190cf5fd2346b, which
apparently causes DRI initialization failures on Radeons.

Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Requested-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/gpu/drm/drm_bufs.c

index 80a257554b307a4bc0346e5f38e3c154ec22f4c5..0411d912d82abb9a82b812eb5e1639029659c60a 100644 (file)
@@ -371,8 +371,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
        list->user_token = list->hash.key << PAGE_SHIFT;
        mutex_unlock(&dev->struct_mutex);
 
        list->user_token = list->hash.key << PAGE_SHIFT;
        mutex_unlock(&dev->struct_mutex);
 
-       if (!(map->flags & _DRM_DRIVER))
-               list->master = dev->primary->master;
+       list->master = dev->primary->master;
        *maplist = list;
        return 0;
        }
        *maplist = list;
        return 0;
        }