drm/nouveau: create base display from common code

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

6 files changed, 31 insertions, 31 deletions

diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.c b/drivers/gpu/drm/nouveau/dispnv04/disp.c
index b13ff0fc42de..2f1ed61f7c8c 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c
@@ -77,11 +77,6 @@ nv04_display_create(struct drm_device *dev)
 
         nouveau_hw_save_vga_fonts(dev, 1);
 
-        ret = nouveau_object_new(nv_object(drm), NVDRM_DEVICE, 0xd1500000,
-                                 NV04_DISP_CLASS, NULL, 0, &disp->core);
-        if (ret)
-                return ret;
-
         nv04_crtc_create(dev, 0);
         if (nv_two_heads(dev))
                 nv04_crtc_create(dev, 1);
diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.h b/drivers/gpu/drm/nouveau/dispnv04/disp.h
index 56a28db04000..4245fc3dab70 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/disp.h
+++ b/drivers/gpu/drm/nouveau/dispnv04/disp.h
@@ -80,7 +80,6 @@ struct nv04_display {
         struct nv04_mode_state saved_reg;
         uint32_t saved_vga_font[4][16384];
         uint32_t dac_users[4];
-        struct nouveau_object *core;
         struct nouveau_bo *image[2];
 };
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 8b757483a107..a22d019bb217 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -407,10 +407,31 @@ nouveau_display_create(struct drm_device *dev)
         drm_kms_helper_poll_disable(dev);
 
         if (drm->vbios.dcb.entries) {
-                if (nv_device(drm->device)->card_type < NV_50)
-                        ret = nv04_display_create(dev);
-                else
-                        ret = nv50_display_create(dev);
+                static const u16 oclass[] = {
+                        NVF0_DISP_CLASS,
+                        NVE0_DISP_CLASS,
+                        NVD0_DISP_CLASS,
+                        NVA3_DISP_CLASS,
+                        NV94_DISP_CLASS,
+                        NVA0_DISP_CLASS,
+                        NV84_DISP_CLASS,
+                        NV50_DISP_CLASS,
+                        NV04_DISP_CLASS,
+                };
+                int i;
+
+                for (i = 0, ret = -ENODEV; ret && i < ARRAY_SIZE(oclass); i++) {
+                        ret = nouveau_object_new(nv_object(drm), NVDRM_DEVICE,
+                                                 NVDRM_DISPLAY, oclass[i],
+                                                 NULL, 0, &disp->core);
+                }
+
+                if (ret == 0) {
+                        if (nv_mclass(disp->core) < NV50_DISP_CLASS)
+                                ret = nv04_display_create(dev);
+                        else
+                                ret = nv50_display_create(dev);
+                }
         } else {
                 ret = 0;
         }
@@ -439,6 +460,7 @@ void
 nouveau_display_destroy(struct drm_device *dev)
 {
         struct nouveau_display *disp = nouveau_display(dev);
+        struct nouveau_drm *drm = nouveau_drm(dev);
 
         nouveau_backlight_exit(dev);
         nouveau_display_vblank_fini(dev);
@@ -449,6 +471,8 @@ nouveau_display_destroy(struct drm_device *dev)
         if (disp->dtor)
                 disp->dtor(dev);
 
+        nouveau_object_del(nv_object(drm), NVDRM_DEVICE, NVDRM_DISPLAY);
+
         nouveau_drm(dev)->display = NULL;
         kfree(disp);
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h b/drivers/gpu/drm/nouveau/nouveau_display.h
index 8bc8bab90e8d..73aa231130b8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.h
+++ b/drivers/gpu/drm/nouveau/nouveau_display.h
@@ -36,6 +36,7 @@ struct nouveau_display {
         int  (*init)(struct drm_device *);
         void (*fini)(struct drm_device *);
 
+        struct nouveau_object *core;
         struct nouveau_eventh **vblank;
 
         struct drm_property *dithering_mode;
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
index 4b0fb6c66be9..23ca7a517246 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
@@ -54,6 +54,7 @@ enum nouveau_drm_handle {
         NVDRM_CLIENT  = 0xffffffff,
         NVDRM_DEVICE  = 0xdddddddd,
         NVDRM_CONTROL = 0xdddddddc,
+        NVDRM_DISPLAY = 0xd1500000,
         NVDRM_PUSH    = 0xbbbb0000, /* |= client chid */
         NVDRM_CHAN    = 0xcccc0000, /* |= client chid */
         NVDRM_NVSW    = 0x55550000,
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 4e384a2f99c3..6ae7a697866e 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -2199,16 +2199,6 @@ nv50_display_destroy(struct drm_device *dev)
 int
 nv50_display_create(struct drm_device *dev)
 {
-        static const u16 oclass[] = {
-                NVF0_DISP_CLASS,
-                NVE0_DISP_CLASS,
-                NVD0_DISP_CLASS,
-                NVA3_DISP_CLASS,
-                NV94_DISP_CLASS,
-                NVA0_DISP_CLASS,
-                NV84_DISP_CLASS,
-                NV50_DISP_CLASS,
-        };
         struct nouveau_device *device = nouveau_dev(dev);
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct dcb_table *dcb = &drm->vbios.dcb;
@@ -2225,6 +2215,7 @@ nv50_display_create(struct drm_device *dev)
         nouveau_display(dev)->dtor = nv50_display_destroy;
         nouveau_display(dev)->init = nv50_display_init;
         nouveau_display(dev)->fini = nv50_display_fini;
+        disp->core = nouveau_display(dev)->core;
 
         /* small shared memory area we use for notifiers and semaphores */
         ret = nouveau_bo_new(dev, 4096, 0x1000, TTM_PL_FLAG_VRAM,
@@ -2243,17 +2234,6 @@ nv50_display_create(struct drm_device *dev)
         if (ret)
                 goto out;
 
-        /* attempt to allocate a supported evo display class */
-        ret = -ENODEV;
-        for (i = 0; ret && i < ARRAY_SIZE(oclass); i++) {
-                ret = nouveau_object_new(nv_object(drm), NVDRM_DEVICE,
-                                         0xd1500000, oclass[i], NULL, 0,
-                                         &disp->core);
-        }
-
-        if (ret)
-                goto out;
-
         /* allocate master evo channel */
         ret = nv50_dmac_create(disp->core, NV50_DISP_MAST_CLASS, 0,
                               &(struct nv50_display_mast_class) {