Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 20 insertions, 0 deletions

diff --git a/drivers/gpu/drm/nouveau/nv04_mc.c b/drivers/gpu/drm/nouveau/nv04_mc.c
new file mode 100644
index 000000000000..617ed1e05269
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nv04_mc.c
@@ -0,0 +1,20 @@
+#include "drmP.h"
+#include "drm.h"
+#include "nouveau_drv.h"
+#include "nouveau_drm.h"
+
+int
+nv04_mc_init(struct drm_device *dev)
+{
+        /* Power up everything, resetting each individual unit will
+         * be done later if needed.
+         */
+
+        nv_wr32(dev, NV03_PMC_ENABLE, 0xFFFFFFFF);
+        return 0;
+}
+
+void
+nv04_mc_takedown(struct drm_device *dev)
+{
+}