Merge branch 'drm-nouveau-fixes-3.8' of git://anongit.freedesktop.org/git/nouveau...

Fixes for one major lockdep warning, one oops reported by a few people, and
fix for a long hang on some gpu engines.

* 'drm-nouveau-fixes-3.8' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: add lockdep annotations
  drm/nv50/fb: Fix nullptr-deref on IGPs
  drm/nouveau: use different register to wait for secret scrubber

diff --combined drivers/gpu/drm/nouveau/nouveau_drm.c
index 8b090f1eb51d7f3ebf284814709ef1f0c472a774,43c78516941b88e42c4e14c2468b2cd84092aa1c..5e7aef23825a0d33f08addfdcb97cc8e663f62b8
--- 1/drivers/gpu/drm/nouveau/nouveau_drm.c
--- 2/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@@ -194,8 -194,8 +194,8 @@@ nouveau_accel_init(struct nouveau_drm *
        nouveau_bo_move_init(drm);
  }
  
 -static int __devinit
 -nouveau_drm_probe(struct pci_dev *pdev, const struct pci_device_id *pent)
 +static int nouveau_drm_probe(struct pci_dev *pdev,
 +                           const struct pci_device_id *pent)
  {
        struct nouveau_device *device;
        struct apertures_struct *aper;
@@@ -245,6 -245,8 +245,8 @@@
        return 0;
  }
  
+ static struct lock_class_key drm_client_lock_class_key;
+ 
  static int
  nouveau_drm_load(struct drm_device *dev, unsigned long flags)
  {
@@@ -256,6 -258,7 +258,7 @@@
        ret = nouveau_cli_create(pdev, "DRM", sizeof(*drm), (void**)&drm);
        if (ret)
                return ret;
+       lockdep_set_class(&drm->client.mutex, &drm_client_lock_class_key);
  
        dev->dev_private = drm;
        drm->dev = dev;