Permalink
Browse files

DRM_LOCK()/DRM_UNLOCK() accepts struct drm_device now

  • Loading branch information...
1 parent 329bdb5 commit 172511e5656e8b5a02074c7642bd109a084a7ec8 Alexander Polakov committed Jul 19, 2012
Showing with 6 additions and 6 deletions.
  1. +2 −2 pscnv/nouveau_fbcon.c
  2. +4 −4 pscnv/nouveau_state.c
View
4 pscnv/nouveau_fbcon.c
@@ -264,7 +264,7 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev,
info->par = nfbdev;
#else
- DRM_LOCK();
+ DRM_LOCK(dev);
#endif // __linux__
nouveau_framebuffer_init(dev, &nfbdev->nouveau_fb, &mode_cmd, nvbo);
@@ -322,7 +322,7 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev,
mutex_unlock(&dev->struct_mutex);
#else // __linux__
- DRM_UNLOCK();
+ DRM_UNLOCK(dev);
#endif
#if 0
if (dev_priv->channel && !nouveau_nofbaccel) {
View
8 pscnv/nouveau_state.c
@@ -372,9 +372,9 @@ nouveau_card_init(struct drm_device *dev)
ret = drm_irq_install(dev);
#else
// SIGH
- DRM_UNLOCK();
+ DRM_UNLOCK(dev);
ret = drm_irq_install(dev);
- DRM_LOCK();
+ DRM_LOCK(dev);
#endif
if (ret)
goto out_display;
@@ -403,9 +403,9 @@ nouveau_card_init(struct drm_device *dev)
nouveau_fbcon_init(dev);
#else
// SIGH
- DRM_UNLOCK();
+ DRM_UNLOCK(dev);
nouveau_fbcon_init(dev);
- DRM_LOCK();
+ DRM_LOCK(dev);
#endif
drm_kms_helper_poll_init(dev);
}

0 comments on commit 172511e

Please sign in to comment.