aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-05 13:21:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-05 13:21:52 -0400
commit27704a16c9e0fb4c6b04344c7c4c40ac16148ec0 (patch)
tree12d63907313d6a5a9483180824df512674301cd6
parente9e10124e269a39de089c5e0d9936fae2ff889b2 (diff)
Revert "drm: don't associate _DRM_DRIVER maps with a master"
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>
-rw-r--r--drivers/gpu/drm/drm_bufs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 80a257554b30..0411d912d82a 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -371,8 +371,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
371 list->user_token = list->hash.key << PAGE_SHIFT; 371 list->user_token = list->hash.key << PAGE_SHIFT;
372 mutex_unlock(&dev->struct_mutex); 372 mutex_unlock(&dev->struct_mutex);
373 373
374 if (!(map->flags & _DRM_DRIVER)) 374 list->master = dev->primary->master;
375 list->master = dev->primary->master;
376 *maplist = list; 375 *maplist = list;
377 return 0; 376 return 0;
378 } 377 }