Merge branch 'drm-nouveau-fixes' of...

Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

Ben says its just a single fix to avoid the wrong pcopy units being used.

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nvc0/copy: check PUNITS to determine which copy engines are disabled

drivers/gpu/drm/nouveau/nouveau_state.c

@@ -736,8 +736,10 @@ nouveau_card_init(struct drm_device *dev)
 			}
 			break;
 		case NV_C0:
+			if (!(nv_rd32(dev, 0x022500) & 0x00000200))
 				nvc0_copy_create(dev, 1);
 		case NV_D0:
+			if (!(nv_rd32(dev, 0x022500) & 0x00000100))
 				nvc0_copy_create(dev, 0);
 			break;
 		default: