8 files changed, 147 insertions, 102 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index cf1c5c0a0abe..9d7928f40fdf 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -34,10 +34,6 @@ static void
 nouveau_user_framebuffer_destroy(struct drm_framebuffer *drm_fb)
 {
         struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);
-        struct drm_device *dev = drm_fb->dev;
-
-        if (drm_fb->fbdev)
-                nouveau_fbcon_remove(dev, drm_fb);
 
         if (fb->nvbo)
                 drm_gem_object_unreference_unlocked(fb->nvbo->gem);
@@ -61,27 +57,20 @@ static const struct drm_framebuffer_funcs nouveau_framebuffer_funcs = {
         .create_handle = nouveau_user_framebuffer_create_handle,
 };
 
-struct drm_framebuffer *
-nouveau_framebuffer_create(struct drm_device *dev, struct nouveau_bo *nvbo,
-                           struct drm_mode_fb_cmd *mode_cmd)
+int
+nouveau_framebuffer_init(struct drm_device *dev, struct nouveau_framebuffer *nouveau_fb,
+                         struct drm_mode_fb_cmd *mode_cmd, struct nouveau_bo *nvbo)
 {
-        struct nouveau_framebuffer *fb;
         int ret;
 
-        fb = kzalloc(sizeof(struct nouveau_framebuffer), GFP_KERNEL);
-        if (!fb)
-                return NULL;
-
-        ret = drm_framebuffer_init(dev, &fb->base, &nouveau_framebuffer_funcs);
+        ret = drm_framebuffer_init(dev, &nouveau_fb->base, &nouveau_framebuffer_funcs);
         if (ret) {
-                kfree(fb);
-                return NULL;
+                return ret;
         }
 
-        drm_helper_mode_fill_fb_struct(&fb->base, mode_cmd);
-
-        fb->nvbo = nvbo;
-        return &fb->base;
+        drm_helper_mode_fill_fb_struct(&nouveau_fb->base, mode_cmd);
+        nouveau_fb->nvbo = nvbo;
+        return 0;
 }
 
 static struct drm_framebuffer *
@@ -89,24 +78,28 @@ nouveau_user_framebuffer_create(struct drm_device *dev,
                                 struct drm_file *file_priv,
                                 struct drm_mode_fb_cmd *mode_cmd)
 {
-        struct drm_framebuffer *fb;
+        struct nouveau_framebuffer *nouveau_fb;
         struct drm_gem_object *gem;
+        int ret;
 
         gem = drm_gem_object_lookup(dev, file_priv, mode_cmd->handle);
         if (!gem)
                 return NULL;
 
-        fb = nouveau_framebuffer_create(dev, nouveau_gem_object(gem), mode_cmd);
-        if (!fb) {
+        nouveau_fb = kzalloc(sizeof(struct nouveau_framebuffer), GFP_KERNEL);
+        if (!nouveau_fb)
+                return NULL;
+
+        ret = nouveau_framebuffer_init(dev, nouveau_fb, mode_cmd, nouveau_gem_object(gem));
+        if (ret) {
                 drm_gem_object_unreference(gem);
                 return NULL;
         }
 
-        return fb;
+        return &nouveau_fb->base;
 }
 
 const struct drm_mode_config_funcs nouveau_mode_config_funcs = {
         .fb_create = nouveau_user_framebuffer_create,
-        .fb_changed = nouveau_fbcon_probe,
 };
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index 1de974acbc65..c6079e36669d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -153,7 +153,6 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
         struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
         struct nouveau_channel *chan;
         struct drm_crtc *crtc;
-        uint32_t fbdev_flags;
         int ret, i;
 
         if (!drm_core_check_feature(dev, DRIVER_MODESET))
@@ -163,8 +162,7 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
                 return 0;
 
         NV_INFO(dev, "Disabling fbcon acceleration...\n");
-        fbdev_flags = dev_priv->fbdev_info->flags;
-        dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED;
+        nouveau_fbcon_save_disable_accel(dev);
 
         NV_INFO(dev, "Unpinning framebuffer(s)...\n");
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -230,9 +228,9 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
         }
 
         acquire_console_sem();
-        fb_set_suspend(dev_priv->fbdev_info, 1);
+        nouveau_fbcon_set_suspend(dev, 1);
         release_console_sem();
-        dev_priv->fbdev_info->flags = fbdev_flags;
+        nouveau_fbcon_restore_accel(dev);
         return 0;
 
 out_abort:
@@ -250,14 +248,12 @@ nouveau_pci_resume(struct pci_dev *pdev)
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nouveau_engine *engine = &dev_priv->engine;
         struct drm_crtc *crtc;
-        uint32_t fbdev_flags;
         int ret, i;
 
         if (!drm_core_check_feature(dev, DRIVER_MODESET))
                 return -ENODEV;
 
-        fbdev_flags = dev_priv->fbdev_info->flags;
-        dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED;
+        nouveau_fbcon_save_disable_accel(dev);
 
         NV_INFO(dev, "We're back, enabling device...\n");
         pci_set_power_state(pdev, PCI_D0);
@@ -332,13 +328,14 @@ nouveau_pci_resume(struct pci_dev *pdev)
         }
 
         acquire_console_sem();
-        fb_set_suspend(dev_priv->fbdev_info, 0);
+        nouveau_fbcon_set_suspend(dev, 0);
         release_console_sem();
 
-        nouveau_fbcon_zfill(dev);
+        nouveau_fbcon_zfill_all(dev);
 
         drm_helper_resume_force_mode(dev);
-        dev_priv->fbdev_info->flags = fbdev_flags;
+
+        nouveau_fbcon_restore_accel(dev);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index d8b559011777..93459e07e829 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -531,8 +531,6 @@ struct drm_nouveau_private {
                 atomic_t validate_sequence;
         } ttm;
 
-        struct fb_info *fbdev_info;
-
         int fifo_alloc_count;
         struct nouveau_channel *fifos[NOUVEAU_MAX_CHANNEL_NR];
 
@@ -628,6 +626,8 @@ struct drm_nouveau_private {
         struct {
                 struct dentry *channel_root;
         } debugfs;
+
+        struct nouveau_fbcon_par *nfbdev;
 };
 
 static inline struct drm_nouveau_private *
diff --git a/drivers/gpu/drm/nouveau/nouveau_fb.h b/drivers/gpu/drm/nouveau/nouveau_fb.h
index 4a3f31aa1949..d432134b71e0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fb.h
+++ b/drivers/gpu/drm/nouveau/nouveau_fb.h
@@ -40,8 +40,6 @@ nouveau_framebuffer(struct drm_framebuffer *fb)
 
 extern const struct drm_mode_config_funcs nouveau_mode_config_funcs;
 
-struct drm_framebuffer *
-nouveau_framebuffer_create(struct drm_device *, struct nouveau_bo *,
-                           struct drm_mode_fb_cmd *);
-
+int nouveau_framebuffer_init(struct drm_device *dev, struct nouveau_framebuffer *nouveau_fb,
+                             struct drm_mode_fb_cmd *mode_cmd, struct nouveau_bo *nvbo);
 #endif /* __NOUVEAU_FB_H__ */
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 68cedd9194fe..712ee42e3cf8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -199,11 +199,10 @@ not_fb:
 }
 #endif
 
-void
-nouveau_fbcon_zfill(struct drm_device *dev)
+static void
+nouveau_fbcon_zfill(struct drm_device *dev, struct nouveau_fbcon_par *fbpar)
 {
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct fb_info *info = dev_priv->fbdev_info;
+        struct fb_info *info = fbpar->helper.fbdev;
         struct fb_fillrect rect;
 
         /* Clear the entire fbcon.  The drm will program every connector
@@ -219,10 +218,9 @@ nouveau_fbcon_zfill(struct drm_device *dev)
 }
 
 static int
-nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width,
-                     uint32_t fb_height, uint32_t surface_width,
-                     uint32_t surface_height, uint32_t surface_depth,
-                     uint32_t surface_bpp, struct drm_framebuffer **pfb)
+nouveau_fbcon_create(struct drm_device *dev,
+                     struct drm_fb_helper_surface_size *sizes,
+                     struct nouveau_fbcon_par **fbpar_p)
 {
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct fb_info *info;
@@ -234,13 +232,13 @@ nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width,
         struct device *device = &dev->pdev->dev;
         int size, ret;
 
-        mode_cmd.width = surface_width;
-        mode_cmd.height = surface_height;
+        mode_cmd.width = sizes->surface_width;
+        mode_cmd.height = sizes->surface_height;
 
-        mode_cmd.bpp = surface_bpp;
+        mode_cmd.bpp = sizes->surface_bpp;
         mode_cmd.pitch = mode_cmd.width * (mode_cmd.bpp >> 3);
         mode_cmd.pitch = roundup(mode_cmd.pitch, 256);
-        mode_cmd.depth = surface_depth;
+        mode_cmd.depth = sizes->surface_depth;
 
         size = mode_cmd.pitch * mode_cmd.height;
         size = roundup(size, PAGE_SIZE);
@@ -269,18 +267,6 @@ nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width,
 
         mutex_lock(&dev->struct_mutex);
 
-        fb = nouveau_framebuffer_create(dev, nvbo, &mode_cmd);
-        if (!fb) {
-                ret = -ENOMEM;
-                NV_ERROR(dev, "failed to allocate fb.\n");
-                goto out_unref;
-        }
-
-        list_add(&fb->filp_head, &dev->mode_config.fb_kernel_list);
-
-        nouveau_fb = nouveau_framebuffer(fb);
-        *pfb = fb;
-
         info = framebuffer_alloc(sizeof(struct nouveau_fbcon_par), device);
         if (!info) {
                 ret = -ENOMEM;
@@ -288,12 +274,20 @@ nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width,
         }
 
         par = info->par;
+        nouveau_framebuffer_init(dev, &par->nouveau_fb, &mode_cmd, nvbo);
+
+        fb = &par->nouveau_fb.base;
+        /* setup helper */
+        par->helper.fb = fb;
+        par->helper.fbdev = info;
         par->helper.funcs = &nouveau_fbcon_helper_funcs;
         par->helper.dev = dev;
+
+        *fbpar_p = par;
+
         ret = drm_fb_helper_init_crtc_count(&par->helper, 2, 4);
         if (ret)
                 goto out_unref;
-        dev_priv->fbdev_info = info;
 
         strcpy(info->fix.id, "nouveaufb");
         if (nouveau_nofbaccel)
@@ -311,7 +305,7 @@ nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width,
         info->screen_size = size;
 
         drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);
-        drm_fb_helper_fill_var(info, fb, fb_width, fb_height);
+        drm_fb_helper_fill_var(info, &par->helper, sizes->fb_width, sizes->fb_height);
 
         /* FIXME: we really shouldn't expose mmio space at all */
         info->fix.mmio_start = pci_resource_start(dev->pdev, 1);
@@ -344,9 +338,6 @@ nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width,
         info->pixmap.flags = FB_PIXMAP_SYSTEM;
         info->pixmap.scan_align = 1;
 
-        fb->fbdev = info;
-
-        par->nouveau_fb = nouveau_fb;
         par->dev = dev;
 
         if (dev_priv->channel && !nouveau_nofbaccel) {
@@ -362,7 +353,7 @@ nouveau_fbcon_create(struct drm_device *dev, uint32_t fb_width,
                 };
         }
 
-        nouveau_fbcon_zfill(dev);
+        nouveau_fbcon_zfill(dev, par);
 
         /* To allow resizeing without swapping buffers */
         NV_INFO(dev, "allocated %dx%d fb: 0x%lx, bo %p\n",
@@ -380,35 +371,59 @@ out:
         return ret;
 }
 
-int
+static int
+nouveau_fbcon_find_or_create_single(struct drm_device *dev,
+                                    struct drm_fb_helper_surface_size *sizes,
+                                    struct drm_fb_helper **fb_ptr)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_fbcon_par *fbpar;
+        int new_fb = 0;
+        int ret;
+
+        if (!dev_priv->nfbdev) {
+                ret = nouveau_fbcon_create(dev, sizes,
+                                           &fbpar);
+                if (ret)
+                        return ret;
+                dev_priv->nfbdev = fbpar;
+                new_fb = 1;
+        } else {
+                fbpar = dev_priv->nfbdev;
+                if (fbpar->nouveau_fb.base.width < sizes->surface_width ||
+                    fbpar->nouveau_fb.base.height < sizes->surface_height) {
+                        DRM_ERROR("Framebuffer not large enough to scale console onto.\n");
+                        return -EINVAL;
+                }
+        }
+        *fb_ptr = &fbpar->helper;
+        return new_fb;
+}
+
+static int
 nouveau_fbcon_probe(struct drm_device *dev)
 {
         NV_DEBUG_KMS(dev, "\n");
 
-        return drm_fb_helper_single_fb_probe(dev, 32, nouveau_fbcon_create);
+        return drm_fb_helper_single_fb_probe(dev, 32, nouveau_fbcon_find_or_create_single);
 }
 
 int
-nouveau_fbcon_remove(struct drm_device *dev, struct drm_framebuffer *fb)
+nouveau_fbcon_destroy(struct drm_device *dev, struct nouveau_fbcon_par *fbpar)
 {
-        struct nouveau_framebuffer *nouveau_fb = nouveau_framebuffer(fb);
+        struct nouveau_framebuffer *nouveau_fb = &fbpar->nouveau_fb;
         struct fb_info *info;
 
-        if (!fb)
-                return -EINVAL;
+        info = fbpar->helper.fbdev;
 
-        info = fb->fbdev;
-        if (info) {
-                struct nouveau_fbcon_par *par = info->par;
+        unregister_framebuffer(info);
+        nouveau_bo_unmap(nouveau_fb->nvbo);
+        drm_gem_object_unreference_unlocked(nouveau_fb->nvbo->gem);
+        nouveau_fb->nvbo = NULL;
+        drm_fb_helper_free(&fbpar->helper);
 
-                unregister_framebuffer(info);
-                nouveau_bo_unmap(nouveau_fb->nvbo);
-                drm_gem_object_unreference_unlocked(nouveau_fb->nvbo->gem);
-                nouveau_fb->nvbo = NULL;
-                if (par)
-                        drm_fb_helper_free(&par->helper);
-                framebuffer_release(info);
-        }
+        drm_framebuffer_cleanup(&nouveau_fb->base);
+        framebuffer_release(info);
 
         return 0;
 }
@@ -421,3 +436,43 @@ void nouveau_fbcon_gpu_lockup(struct fb_info *info)
         NV_ERROR(dev, "GPU lockup - switching to software fbcon\n");
         info->flags |= FBINFO_HWACCEL_DISABLED;
 }
+
+int nouveau_fbcon_init(struct drm_device *dev)
+{
+        drm_helper_initial_config(dev);
+        nouveau_fbcon_probe(dev);
+        return 0;
+}
+
+void nouveau_fbcon_fini(struct drm_device *dev)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        nouveau_fbcon_destroy(dev, dev_priv->nfbdev);
+        dev_priv->nfbdev = NULL;
+}
+
+void nouveau_fbcon_save_disable_accel(struct drm_device *dev)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+
+        dev_priv->nfbdev->saved_flags = dev_priv->nfbdev->helper.fbdev->flags;
+        dev_priv->nfbdev->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED;
+}
+
+void nouveau_fbcon_restore_accel(struct drm_device *dev)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        dev_priv->nfbdev->helper.fbdev->flags = dev_priv->nfbdev->saved_flags;
+}
+
+void nouveau_fbcon_set_suspend(struct drm_device *dev, int state)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        fb_set_suspend(dev_priv->nfbdev->helper.fbdev, state);
+}
+
+void nouveau_fbcon_zfill_all(struct drm_device *dev)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        nouveau_fbcon_zfill(dev, dev_priv->nfbdev);
+}
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.h b/drivers/gpu/drm/nouveau/nouveau_fbcon.h
index f9c34e1a8c11..fa66cb9fa4d4 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.h
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.h
@@ -29,16 +29,16 @@
 
 #include "drm_fb_helper.h"
 
+#include "nouveau_fb.h"
 struct nouveau_fbcon_par {
         struct drm_fb_helper helper;
+        struct nouveau_framebuffer nouveau_fb;
+        struct list_head fbdev_list;
         struct drm_device *dev;
-        struct nouveau_framebuffer *nouveau_fb;
+        unsigned int saved_flags;
 };
 
-int nouveau_fbcon_probe(struct drm_device *dev);
-int nouveau_fbcon_remove(struct drm_device *dev, struct drm_framebuffer *fb);
 void nouveau_fbcon_restore(void);
-void nouveau_fbcon_zfill(struct drm_device *dev);
 
 void nv04_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region);
 void nv04_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
@@ -50,5 +50,12 @@ void nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image);
 int nv50_fbcon_accel_init(struct fb_info *info);
 
 void nouveau_fbcon_gpu_lockup(struct fb_info *info);
+
+int nouveau_fbcon_init(struct drm_device *dev);
+void nouveau_fbcon_fini(struct drm_device *dev);
+void nouveau_fbcon_set_suspend(struct drm_device *dev, int state);
+void nouveau_fbcon_zfill_all(struct drm_device *dev);
+void nouveau_fbcon_save_disable_accel(struct drm_device *dev);
+void nouveau_fbcon_restore_accel(struct drm_device *dev);
 #endif /* __NV50_FBCON_H__ */
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index 2bd59a92fee5..0aa08b3be375 100644
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
@@ -1203,7 +1203,7 @@ nouveau_irq_handler(DRM_IRQ_ARGS)
 {
         struct drm_device *dev = (struct drm_device *)arg;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
-        uint32_t status, fbdev_flags = 0;
+        uint32_t status;
         unsigned long flags;
 
         status = nv_rd32(dev, NV03_PMC_INTR_0);
@@ -1212,11 +1212,6 @@ nouveau_irq_handler(DRM_IRQ_ARGS)
 
         spin_lock_irqsave(&dev_priv->context_switch_lock, flags);
 
-        if (dev_priv->fbdev_info) {
-                fbdev_flags = dev_priv->fbdev_info->flags;
-                dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED;
-        }
-
         if (status & NV_PMC_INTR_0_PFIFO_PENDING) {
                 nouveau_fifo_irq_handler(dev);
                 status &= ~NV_PMC_INTR_0_PFIFO_PENDING;
@@ -1246,9 +1241,6 @@ nouveau_irq_handler(DRM_IRQ_ARGS)
         if (status)
                 NV_ERROR(dev, "Unhandled PMC INTR status bits 0x%08x\n", status);
 
-        if (dev_priv->fbdev_info)
-                dev_priv->fbdev_info->flags = fbdev_flags;
-
         spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags);
 
         return IRQ_HANDLED;
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 58b46807de23..23e67bf0898c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -33,6 +33,7 @@
 
 #include "nouveau_drv.h"
 #include "nouveau_drm.h"
+#include "nouveau_fbcon.h"
 #include "nv50_display.h"
 
 static void nouveau_stub_takedown(struct drm_device *dev) {}
@@ -511,7 +512,7 @@ nouveau_card_init(struct drm_device *dev)
         dev_priv->init_state = NOUVEAU_CARD_INIT_DONE;
 
         if (drm_core_check_feature(dev, DRIVER_MODESET))
-                drm_helper_initial_config(dev);
+                nouveau_fbcon_init(dev);
 
         return 0;
 
@@ -552,6 +553,7 @@ static void nouveau_card_takedown(struct drm_device *dev)
         NV_DEBUG(dev, "prev state = %d\n", dev_priv->init_state);
 
         if (dev_priv->init_state != NOUVEAU_CARD_INIT_DOWN) {
+
                 nouveau_backlight_exit(dev);
 
                 if (dev_priv->channel) {
@@ -783,6 +785,7 @@ int nouveau_unload(struct drm_device *dev)
         struct drm_nouveau_private *dev_priv = dev->dev_private;
 
         if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                nouveau_fbcon_fini(dev);
                 if (dev_priv->card_type >= NV_50)
                         nv50_display_destroy(dev);
                 else