mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 12:16:20 +00:00
Revert "drm: don't associate _DRM_DRIVER maps with a master"
This reverts commit 6c51d1cfa0
, 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>
This commit is contained in:
parent
e9e10124e2
commit
27704a16c9
1 changed files with 1 additions and 2 deletions
|
@ -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;
|
list->user_token = list->hash.key << PAGE_SHIFT;
|
||||||
mutex_unlock(&dev->struct_mutex);
|
mutex_unlock(&dev->struct_mutex);
|
||||||
|
|
||||||
if (!(map->flags & _DRM_DRIVER))
|
|
||||||
list->master = dev->primary->master;
|
list->master = dev->primary->master;
|
||||||
*maplist = list;
|
*maplist = list;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue