diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-03-30 05:40:44 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-04-20 06:56:49 -0400 |
commit | ca25d6b08f3351c4e655a6ef70f19da6569312ec (patch) | |
tree | 9d9045baf8ede5532c7b6f109e5a060bee7a0f5a /drivers/gpu/drm/nouveau/nouveau_fbcon.c | |
parent | 068149ad22efaed34598130aa79140e70bf198d0 (diff) |
drm/nouveau: Drop dev->struct_mutex from fbdev init
Doesn't protect anything at all.
With this patch nouveau is completely dev->struct_mutex free!
Cc: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459330852-27668-6-git-send-email-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fbcon.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 59f27e774acb..3bae706126bd 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c | |||
@@ -386,8 +386,6 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, | |||
386 | } | 386 | } |
387 | } | 387 | } |
388 | 388 | ||
389 | mutex_lock(&dev->struct_mutex); | ||
390 | |||
391 | info = drm_fb_helper_alloc_fbi(helper); | 389 | info = drm_fb_helper_alloc_fbi(helper); |
392 | if (IS_ERR(info)) { | 390 | if (IS_ERR(info)) { |
393 | ret = PTR_ERR(info); | 391 | ret = PTR_ERR(info); |
@@ -426,8 +424,6 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, | |||
426 | 424 | ||
427 | /* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */ | 425 | /* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */ |
428 | 426 | ||
429 | mutex_unlock(&dev->struct_mutex); | ||
430 | |||
431 | if (chan) | 427 | if (chan) |
432 | nouveau_fbcon_accel_init(dev); | 428 | nouveau_fbcon_accel_init(dev); |
433 | nouveau_fbcon_zfill(dev, fbcon); | 429 | nouveau_fbcon_zfill(dev, fbcon); |
@@ -441,7 +437,6 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, | |||
441 | return 0; | 437 | return 0; |
442 | 438 | ||
443 | out_unlock: | 439 | out_unlock: |
444 | mutex_unlock(&dev->struct_mutex); | ||
445 | if (chan) | 440 | if (chan) |
446 | nouveau_bo_vma_del(nvbo, &fbcon->nouveau_fb.vma); | 441 | nouveau_bo_vma_del(nvbo, &fbcon->nouveau_fb.vma); |
447 | nouveau_bo_unmap(nvbo); | 442 | nouveau_bo_unmap(nvbo); |