8 files changed, 32 insertions, 67 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_crtc.h b/drivers/gpu/drm/nouveau/nouveau_crtc.h
index cb1ce2a09162..bf8e1289953d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_crtc.h
+++ b/drivers/gpu/drm/nouveau/nouveau_crtc.h
@@ -82,14 +82,13 @@ static inline struct drm_crtc *to_drm_crtc(struct nouveau_crtc *crtc)
 }
 
 int nv50_crtc_create(struct drm_device *dev, int index);
-int nv50_cursor_init(struct nouveau_crtc *);
-void nv50_cursor_fini(struct nouveau_crtc *);
 int nv50_crtc_cursor_set(struct drm_crtc *drm_crtc, struct drm_file *file_priv,
                          uint32_t buffer_handle, uint32_t width,
                          uint32_t height);
 int nv50_crtc_cursor_move(struct drm_crtc *drm_crtc, int x, int y);
 
 int nv04_cursor_init(struct nouveau_crtc *);
+int nv50_cursor_init(struct nouveau_crtc *);
 
 struct nouveau_connector *
 nouveau_crtc_connector_get(struct nouveau_crtc *crtc);
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 842cd7acde8a..0661bcc94e57 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -736,7 +736,6 @@ struct drm_nouveau_private {
         uint64_t vram_size;
         uint64_t vram_sys_base;
 
-        uint64_t fb_phys;
         uint64_t fb_available_size;
         uint64_t fb_mappable_pages;
         uint64_t fb_aper_free;
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index f9ae2fc3d6f1..bd3c39f69388 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -408,8 +408,6 @@ nouveau_mem_vram_init(struct drm_device *dev)
         if (ret)
                 return ret;
 
-        dev_priv->fb_phys = pci_resource_start(dev->pdev, 1);
-
         ret = nouveau_ttm_global_init(dev_priv);
         if (ret)
                 return ret;
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 07691c2eceac..2d7a4ed60142 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -657,6 +657,26 @@ nouveau_card_init(struct drm_device *dev)
                         goto out_engine;
         }
 
+        /* initialise general modesetting */
+        drm_mode_config_init(dev);
+        drm_mode_create_scaling_mode_property(dev);
+        drm_mode_create_dithering_property(dev);
+        dev->mode_config.funcs = (void *)&nouveau_mode_config_funcs;
+        dev->mode_config.fb_base = pci_resource_start(dev->pdev, 1);
+        dev->mode_config.min_width = 0;
+        dev->mode_config.min_height = 0;
+        if (dev_priv->card_type < NV_10) {
+                dev->mode_config.max_width = 2048;
+                dev->mode_config.max_height = 2048;
+        } else
+        if (dev_priv->card_type < NV_50) {
+                dev->mode_config.max_width = 4096;
+                dev->mode_config.max_height = 4096;
+        } else {
+                dev->mode_config.max_width = 8192;
+                dev->mode_config.max_height = 8192;
+        }
+
         ret = engine->display.create(dev);
         if (ret)
                 goto out_fifo;
@@ -747,6 +767,7 @@ static void nouveau_card_takedown(struct drm_device *dev)
         }
 
         engine->display.destroy(dev);
+        drm_mode_config_cleanup(dev);
 
         if (!dev_priv->noaccel) {
                 engine->fifo.takedown(dev);
diff --git a/drivers/gpu/drm/nouveau/nv04_display.c b/drivers/gpu/drm/nouveau/nv04_display.c
index 1715e1464b7d..6bd8518d7b2e 100644
--- a/drivers/gpu/drm/nouveau/nv04_display.c
+++ b/drivers/gpu/drm/nouveau/nv04_display.c
@@ -126,27 +126,6 @@ nv04_display_create(struct drm_device *dev)
 
         nouveau_hw_save_vga_fonts(dev, 1);
 
-        drm_mode_config_init(dev);
-        drm_mode_create_scaling_mode_property(dev);
-        drm_mode_create_dithering_property(dev);
-
-        dev->mode_config.funcs = (void *)&nouveau_mode_config_funcs;
-
-        dev->mode_config.min_width = 0;
-        dev->mode_config.min_height = 0;
-        switch (dev_priv->card_type) {
-        case NV_04:
-                dev->mode_config.max_width = 2048;
-                dev->mode_config.max_height = 2048;
-                break;
-        default:
-                dev->mode_config.max_width = 4096;
-                dev->mode_config.max_height = 4096;
-                break;
-        }
-
-        dev->mode_config.fb_base = dev_priv->fb_phys;
-
         nv04_crtc_create(dev, 0);
         if (nv_two_heads(dev))
                 nv04_crtc_create(dev, 1);
@@ -235,8 +214,6 @@ nv04_display_destroy(struct drm_device *dev)
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
                 crtc->funcs->restore(crtc);
 
-        drm_mode_config_cleanup(dev);
-
         nouveau_hw_save_vga_fonts(dev, 0);
 }
 
diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
index 5d989073ba6e..882080e0b4f5 100644
--- a/drivers/gpu/drm/nouveau/nv50_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
@@ -329,8 +329,6 @@ nv50_crtc_destroy(struct drm_crtc *crtc)
 
         drm_crtc_cleanup(&nv_crtc->base);
 
-        nv50_cursor_fini(nv_crtc);
-
         nouveau_bo_unmap(nv_crtc->lut.nvbo);
         nouveau_bo_ref(NULL, &nv_crtc->lut.nvbo);
         nouveau_bo_unmap(nv_crtc->cursor.nvbo);
diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c
index 9752c35bb84b..adfc9b607a50 100644
--- a/drivers/gpu/drm/nouveau/nv50_cursor.c
+++ b/drivers/gpu/drm/nouveau/nv50_cursor.c
@@ -137,21 +137,3 @@ nv50_cursor_init(struct nouveau_crtc *nv_crtc)
         nv_crtc->cursor.show = nv50_cursor_show;
         return 0;
 }
-
-void
-nv50_cursor_fini(struct nouveau_crtc *nv_crtc)
-{
-        struct drm_device *dev = nv_crtc->base.dev;
-        int idx = nv_crtc->index;
-
-        NV_DEBUG_KMS(dev, "\n");
-
-        nv_wr32(dev, NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(idx), 0);
-        if (!nv_wait(dev, NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(idx),
-                     NV50_PDISPLAY_CURSOR_CURSOR_CTRL2_STATUS, 0)) {
-                NV_ERROR(dev, "timeout: CURSOR_CTRL2_STATUS == 0\n");
-                NV_ERROR(dev, "CURSOR_CTRL2 = 0x%08x\n",
-                         nv_rd32(dev, NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(idx)));
-        }
-}
-
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index db1a5f4b711d..5754c0ac8937 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -247,6 +247,16 @@ static int nv50_display_disable(struct drm_device *dev)
                 }
         }
 
+        for (i = 0; i < 2; i++) {
+                nv_wr32(dev, NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(i), 0);
+                if (!nv_wait(dev, NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(i),
+                             NV50_PDISPLAY_CURSOR_CURSOR_CTRL2_STATUS, 0)) {
+                        NV_ERROR(dev, "timeout: CURSOR_CTRL2_STATUS == 0\n");
+                        NV_ERROR(dev, "CURSOR_CTRL2 = 0x%08x\n",
+                                 nv_rd32(dev, NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(i)));
+                }
+        }
+
         nv50_evo_fini(dev);
 
         for (i = 0; i < 3; i++) {
@@ -286,23 +296,6 @@ int nv50_display_create(struct drm_device *dev)
                 return -ENOMEM;
         dev_priv->engine.display.priv = priv;
 
-        /* init basic kernel modesetting */
-        drm_mode_config_init(dev);
-
-        /* Initialise some optional connector properties. */
-        drm_mode_create_scaling_mode_property(dev);
-        drm_mode_create_dithering_property(dev);
-
-        dev->mode_config.min_width = 0;
-        dev->mode_config.min_height = 0;
-
-        dev->mode_config.funcs = (void *)&nouveau_mode_config_funcs;
-
-        dev->mode_config.max_width = 8192;
-        dev->mode_config.max_height = 8192;
-
-        dev->mode_config.fb_base = dev_priv->fb_phys;
-
         /* Create CRTC objects */
         for (i = 0; i < 2; i++)
                 nv50_crtc_create(dev, i);
@@ -364,8 +357,6 @@ nv50_display_destroy(struct drm_device *dev)
 
         NV_DEBUG_KMS(dev, "\n");
 
-        drm_mode_config_cleanup(dev);
-
         nv50_display_disable(dev);
         nouveau_irq_unregister(dev, 26);
         kfree(disp);