Skip to content
This repository
Browse code

DRM_LOCK()/DRM_UNLOCK() accepts struct drm_device now

  • Loading branch information...
commit 172511e5656e8b5a02074c7642bd109a084a7ec8 1 parent 329bdb5
Alexander Polakov authored

Showing 2 changed files with 6 additions and 6 deletions. Show diff stats Hide diff stats

  1. +2 2 pscnv/nouveau_fbcon.c
  2. +4 4 pscnv/nouveau_state.c
4 pscnv/nouveau_fbcon.c
@@ -264,7 +264,7 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev,
264 264
265 265 info->par = nfbdev;
266 266 #else
267   - DRM_LOCK();
  267 + DRM_LOCK(dev);
268 268 #endif // __linux__
269 269
270 270 nouveau_framebuffer_init(dev, &nfbdev->nouveau_fb, &mode_cmd, nvbo);
@@ -322,7 +322,7 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev,
322 322
323 323 mutex_unlock(&dev->struct_mutex);
324 324 #else // __linux__
325   - DRM_UNLOCK();
  325 + DRM_UNLOCK(dev);
326 326 #endif
327 327 #if 0
328 328 if (dev_priv->channel && !nouveau_nofbaccel) {
8 pscnv/nouveau_state.c
@@ -372,9 +372,9 @@ nouveau_card_init(struct drm_device *dev)
372 372 ret = drm_irq_install(dev);
373 373 #else
374 374 // SIGH
375   - DRM_UNLOCK();
  375 + DRM_UNLOCK(dev);
376 376 ret = drm_irq_install(dev);
377   - DRM_LOCK();
  377 + DRM_LOCK(dev);
378 378 #endif
379 379 if (ret)
380 380 goto out_display;
@@ -403,9 +403,9 @@ nouveau_card_init(struct drm_device *dev)
403 403 nouveau_fbcon_init(dev);
404 404 #else
405 405 // SIGH
406   - DRM_UNLOCK();
  406 + DRM_UNLOCK(dev);
407 407 nouveau_fbcon_init(dev);
408   - DRM_LOCK();
  408 + DRM_LOCK(dev);
409 409 #endif
410 410 drm_kms_helper_poll_init(dev);
411 411 }

0 comments on commit 172511e

Please sign in to comment.
Something went wrong with that request. Please try again.