diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2009-05-26 10:35:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-06-04 09:47:49 +1000 |
| commit | 6c51d1cfa0a370b48a157163340190cf5fd2346b (patch) | |
| tree | 0c77e9df84de710e18a6927e6972af12e3cdfd23 /drivers | |
| parent | 93c05f222413e3a16e8785f252db4726693abd71 (diff) | |
| download | linux-6c51d1cfa0a370b48a157163340190cf5fd2346b.tar.bz2 | |
drm: don't associate _DRM_DRIVER maps with a master
A driver will use the _DRM_DRIVER map flag to indicate that it wants
to be responsible for removing the map itself, bypassing the DRM's
automagic cleanup code.
Since the multi-master changes this has been broken, resulting in some
drivers having their registers unmapped before it's finished with them.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/drm_bufs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 0411d912d82a..80a257554b30 100644 --- 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; } |