From 8b0d271f65ebc4e68862cb5c357e11f4f6c6b9bf Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 26 May 2009 10:35:52 +1000 Subject: [PATCH] --- yaml --- r: 145487 b: refs/heads/master c: 6c51d1cfa0a370b48a157163340190cf5fd2346b h: refs/heads/master i: 145485: 381eba94bcbb2dd40cc2e5e6309e63f5ddb1abaa 145483: 62c3b9de59230313b556cbb2d4519e94546f0f9c 145479: 3be261542fcd3247daadceca0bd1f49d6f06a1eb 145471: f826d57cef3a30a7a16c09efb03623c844c94e8a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_bufs.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cc239b191f80..f6b61fdd476d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93c05f222413e3a16e8785f252db4726693abd71 +refs/heads/master: 6c51d1cfa0a370b48a157163340190cf5fd2346b diff --git a/trunk/drivers/gpu/drm/drm_bufs.c b/trunk/drivers/gpu/drm/drm_bufs.c index 0411d912d82a..80a257554b30 100644 --- a/trunk/drivers/gpu/drm/drm_bufs.c +++ b/trunk/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; }