Skip to content

Commit

Permalink
Revert "drm: don't associate _DRM_DRIVER maps with a master"
Browse files Browse the repository at this point in the history
This reverts commit 6c51d1c, 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>
  • Loading branch information
Linus Torvalds committed Jun 5, 2009
1 parent e9e1012 commit 27704a1
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/drm_bufs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 27704a1

Please sign in to comment.