diff options
| author | Linus Torvalds | 2009-06-05 19:21:52 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-06-05 19:21:52 +0200 |
| commit | 27704a16c9e0fb4c6b04344c7c4c40ac16148ec0 (patch) | |
| tree | 12d63907313d6a5a9483180824df512674301cd6 | |
| parent | ivtv: Fix PCI DMA direction (diff) | |
| download | kernel-qcow2-linux-27704a16c9e0fb4c6b04344c7c4c40ac16148ec0.tar.gz kernel-qcow2-linux-27704a16c9e0fb4c6b04344c7c4c40ac16148ec0.tar.xz kernel-qcow2-linux-27704a16c9e0fb4c6b04344c7c4c40ac16148ec0.zip | |
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.c | 3 |
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, 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; } |