git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
drm: don't associate _DRM_DRIVER maps with a master
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
drm_bufs.c
diff --git
a/drivers/gpu/drm/drm_bufs.c
b/drivers/gpu/drm/drm_bufs.c
index
0411d91
..
80a2575
100644
(file)
--- a/
drivers/gpu/drm/drm_bufs.c
+++ b/
drivers/gpu/drm/drm_bufs.c
@@
-371,7
+371,8
@@
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);
- list->master = dev->primary->master;
+ if (!(map->flags & _DRM_DRIVER))
+ list->master = dev->primary->master;
*maplist = list;
return 0;
}