Commit 27704a16 authored by Linus Torvalds's avatar 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: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
Requested-by: default avatarDave Airlie <airlied@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e9e10124
......@@ -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);
if (!(map->flags & _DRM_DRIVER))
list->master = dev->primary->master;
list->master = dev->primary->master;
*maplist = list;
return 0;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment