Commit 27704a16 authored Jun 05, 2009 by Linus Torvalds

Revert "drm: don't associate _DRM_DRIVER maps with a master"



This reverts commit 6c51d1cf, 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>

parent e9e10124

drivers/gpu/drm/drm_bufs.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -371,7 +371,6 @@ 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);

		if (!(map->flags & _DRM_DRIVER))
		list->master = dev->primary->master;
		*maplist = list;
		return 0;