summaryrefslogtreecommitdiff
path: root/drm/nouveau/nouveau_fbcon.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-05-20 09:09:01 +1000
committerBen Skeggs <bskeggs@redhat.com>2016-05-20 09:09:01 +1000
commit861abc5bcbc935eb0f80c7c6966882b710c28bca (patch)
tree76d2cab0d36ae6395ff6926f862a0397bb3bd037 /drm/nouveau/nouveau_fbcon.c
parentc8ba3928c74e4d403b2315444a380e6923050ae2 (diff)
downloadnouveau-861abc5bcbc935eb0f80c7c6966882b710c28bca.tar.gz
drm-next 7c10ddf87472c07eabc206e273dc59f77c700858
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nouveau_fbcon.c')
-rw-r--r--drm/nouveau/nouveau_fbcon.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drm/nouveau/nouveau_fbcon.c b/drm/nouveau/nouveau_fbcon.c
index 59f27e774..3bae70612 100644
--- a/drm/nouveau/nouveau_fbcon.c
+++ b/drm/nouveau/nouveau_fbcon.c
@@ -386,8 +386,6 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
}
}
- mutex_lock(&dev->struct_mutex);
-
info = drm_fb_helper_alloc_fbi(helper);
if (IS_ERR(info)) {
ret = PTR_ERR(info);
@@ -426,8 +424,6 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
- mutex_unlock(&dev->struct_mutex);
-
if (chan)
nouveau_fbcon_accel_init(dev);
nouveau_fbcon_zfill(dev, fbcon);
@@ -441,7 +437,6 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
return 0;
out_unlock:
- mutex_unlock(&dev->struct_mutex);
if (chan)
nouveau_bo_vma_del(nvbo, &fbcon->nouveau_fb.vma);
nouveau_bo_unmap(nvbo);