Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / nouveau_state.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 9b4c900a3f30ddc7fb02c25721aa9a2141a5882c..19706f0532eac60deb973b0b994ad0065a04f980 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -737,8 +737,9 @@ nouveau_card_init(struct drm_device *dev)
                        }
                        break;
                case NV_C0:
-                       nvc0_copy_create(dev, 0);
                        nvc0_copy_create(dev, 1);
+               case NV_D0:
+                       nvc0_copy_create(dev, 0);
                        break;
                default:
                        break;
@@ -839,6 +840,7 @@ out_bios:
 out_display_early:
        engine->display.late_takedown(dev);
 out:
+       vga_switcheroo_unregister_client(dev->pdev);
        vga_client_register(dev->pdev, NULL, NULL, NULL);
        return ret;
 }
@@ -894,6 +896,7 @@ static void nouveau_card_takedown(struct drm_device *dev)
 
        nouveau_irq_fini(dev);
 
+       vga_switcheroo_unregister_client(dev->pdev);
        vga_client_register(dev->pdev, NULL, NULL, NULL);
 }
 
@@ -1101,7 +1104,7 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
                goto err_priv;
        }
 
-       NV_INFO(dev, "Detected an NV%2x generation card (0x%08x)\n",
+       NV_INFO(dev, "Detected an NV%02x generation card (0x%08x)\n",
                     dev_priv->card_type, reg0);
 
        /* map the mmio regs, limiting the amount to preserve vmap space */