drm/fb: fix fbdev object model + cleanup properly.

The fbdev layer in the kms code should act like a consumer of the kms services and avoid having relying on information being store in the kms core structures in order for it to work.

This patch

a) removes the info pointer/psuedo palette from the core drm_framebuffer structure and moves it to the fbdev helper layer, it also removes the core drm keeping a list of kernel kms fbdevs.
b) migrated all the fb helper functions out of the crtc helper file into the fb helper file.
c) pushed the fb probing/hotplug control into the driver
d) makes the surface sizes into a structure for ease of passing
This changes the intel/radeon/nouveau drivers to use the new helper.

Signed-off-by: Dave Airlie <airlied@redhat.com>

5 files changed, 110 insertions, 121 deletions

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 8bfc0bbf13e6..7c7d229ddde0 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1491,7 +1491,7 @@ static int i915_load_modeset_init(struct drm_device *dev,
 
         I915_WRITE(INSTPM, (1 << 5) | (1 << 21));
 
-        drm_helper_initial_config(dev);
+        intel_fbdev_init(dev);
 
         return 0;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 979439cfb827..601f354e467e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -220,6 +220,8 @@ enum no_fbc_reason {
         FBC_NOT_TILED, /* buffer not tiled */
 };
 
+struct intel_kernel_fbdev;
+
 typedef struct drm_i915_private {
         struct drm_device *dev;
 
@@ -627,6 +629,8 @@ typedef struct drm_i915_private {
         u8 max_delay;
 
         enum no_fbc_reason no_fbc_reason;
+
+        struct intel_kernel_fbdev *fbdev;
 } drm_i915_private_t;
 
 /** driver private structure attached to each drm_gem_object */
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9cd6de5f9906..80577b8a368b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4506,10 +4506,6 @@ static void intel_setup_outputs(struct drm_device *dev)
 static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb)
 {
         struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
-        struct drm_device *dev = fb->dev;
-
-        if (fb->fbdev)
-                intelfb_remove(dev, fb);
 
         drm_framebuffer_cleanup(fb);
         drm_gem_object_unreference_unlocked(intel_fb->obj);
@@ -4532,18 +4528,13 @@ static const struct drm_framebuffer_funcs intel_fb_funcs = {
         .create_handle = intel_user_framebuffer_create_handle,
 };
 
-int intel_framebuffer_create(struct drm_device *dev,
-                             struct drm_mode_fb_cmd *mode_cmd,
-                             struct drm_framebuffer **fb,
-                             struct drm_gem_object *obj)
+int intel_framebuffer_init(struct drm_device *dev,
+                           struct intel_framebuffer *intel_fb,
+                           struct drm_mode_fb_cmd *mode_cmd,
+                           struct drm_gem_object *obj)
 {
-        struct intel_framebuffer *intel_fb;
         int ret;
 
-        intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL);
-        if (!intel_fb)
-                return -ENOMEM;
-
         ret = drm_framebuffer_init(dev, &intel_fb->base, &intel_fb_funcs);
         if (ret) {
                 DRM_ERROR("framebuffer init failed %d\n", ret);
@@ -4551,40 +4542,40 @@ int intel_framebuffer_create(struct drm_device *dev,
         }
 
         drm_helper_mode_fill_fb_struct(&intel_fb->base, mode_cmd);
-
         intel_fb->obj = obj;
-
-        *fb = &intel_fb->base;
-
         return 0;
 }
 
-
 static struct drm_framebuffer *
 intel_user_framebuffer_create(struct drm_device *dev,
                               struct drm_file *filp,
                               struct drm_mode_fb_cmd *mode_cmd)
 {
         struct drm_gem_object *obj;
-        struct drm_framebuffer *fb;
+        struct intel_framebuffer *intel_fb;
         int ret;
 
         obj = drm_gem_object_lookup(dev, filp, mode_cmd->handle);
         if (!obj)
                 return NULL;
 
-        ret = intel_framebuffer_create(dev, mode_cmd, &fb, obj);
+        intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL);
+        if (!intel_fb)
+                return NULL;
+
+        ret = intel_framebuffer_init(dev, intel_fb,
+                                     mode_cmd, obj);
         if (ret) {
                 drm_gem_object_unreference_unlocked(obj);
+                kfree(intel_fb);
                 return NULL;
         }
 
-        return fb;
+        return &intel_fb->base;
 }
 
 static const struct drm_mode_config_funcs intel_mode_funcs = {
         .fb_create = intel_user_framebuffer_create,
-        .fb_changed = intelfb_probe,
 };
 
 static struct drm_gem_object *
@@ -4924,6 +4915,8 @@ void intel_modeset_cleanup(struct drm_device *dev)
 
         mutex_lock(&dev->struct_mutex);
 
+        intel_fbdev_fini(dev);
+
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
                 /* Skip inactive CRTCs */
                 if (!crtc->fb)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 3a467ca57857..9ffb9f2c9abd 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -200,9 +200,6 @@ extern void intel_release_load_detect_pipe(struct intel_output *intel_output,
 extern struct drm_connector* intel_sdvo_find(struct drm_device *dev, int sdvoB);
 extern int intel_sdvo_supports_hotplug(struct drm_connector *connector);
 extern void intel_sdvo_set_hotplug(struct drm_connector *connector, int enable);
-extern int intelfb_probe(struct drm_device *dev);
-extern int intelfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
-extern int intelfb_resize(struct drm_device *dev, struct drm_crtc *crtc);
 extern void intelfb_restore(void);
 extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
                                     u16 blue, int regno);
@@ -212,10 +209,12 @@ extern void intel_init_clock_gating(struct drm_device *dev);
 extern void ironlake_enable_drps(struct drm_device *dev);
 extern void ironlake_disable_drps(struct drm_device *dev);
 
-extern int intel_framebuffer_create(struct drm_device *dev,
-                                    struct drm_mode_fb_cmd *mode_cmd,
-                                    struct drm_framebuffer **fb,
-                                    struct drm_gem_object *obj);
+extern int intel_framebuffer_init(struct drm_device *dev,
+                                  struct intel_framebuffer *ifb,
+                                  struct drm_mode_fb_cmd *mode_cmd,
+                                  struct drm_gem_object *obj);
+extern int intel_fbdev_init(struct drm_device *dev);
+extern void intel_fbdev_fini(struct drm_device *dev);
 
 extern void intel_prepare_page_flip(struct drm_device *dev, int plane);
 extern void intel_finish_page_flip(struct drm_device *dev, int pipe);
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index 8cd791dc5b29..b0de9bbde34a 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -45,9 +45,10 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
-struct intelfb_par {
+struct intel_kernel_fbdev {
         struct drm_fb_helper helper;
-        struct intel_framebuffer *intel_fb;
+        struct intel_framebuffer ifb;
+        struct list_head fbdev_list;
         struct drm_display_mode *our_mode;
 };
 
@@ -70,54 +71,12 @@ static struct drm_fb_helper_funcs intel_fb_helper_funcs = {
 };
 
 
-/**
- * Currently it is assumed that the old framebuffer is reused.
- *
- * LOCKING
- * caller should hold the mode config lock.
- *
- */
-int intelfb_resize(struct drm_device *dev, struct drm_crtc *crtc)
+static int intelfb_create(struct drm_device *dev,
+                          struct drm_fb_helper_surface_size *sizes,
+                          struct intel_kernel_fbdev **ifbdev_p)
 {
         struct fb_info *info;
-        struct drm_framebuffer *fb;
-        struct drm_display_mode *mode = crtc->desired_mode;
-
-        fb = crtc->fb;
-        if (!fb)
-                return 1;
-
-        info = fb->fbdev;
-        if (!info)
-                return 1;
-
-        if (!mode)
-                return 1;
-
-        info->var.xres = mode->hdisplay;
-        info->var.right_margin = mode->hsync_start - mode->hdisplay;
-        info->var.hsync_len = mode->hsync_end - mode->hsync_start;
-        info->var.left_margin = mode->htotal - mode->hsync_end;
-        info->var.yres = mode->vdisplay;
-        info->var.lower_margin = mode->vsync_start - mode->vdisplay;
-        info->var.vsync_len = mode->vsync_end - mode->vsync_start;
-        info->var.upper_margin = mode->vtotal - mode->vsync_end;
-        info->var.pixclock = 10000000 / mode->htotal * 1000 / mode->vtotal * 100;
-        /* avoid overflow */
-        info->var.pixclock = info->var.pixclock * 1000 / mode->vrefresh;
-
-        return 0;
-}
-EXPORT_SYMBOL(intelfb_resize);
-
-static int intelfb_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 **fb_p)
-{
-        struct fb_info *info;
-        struct intelfb_par *par;
+        struct intel_kernel_fbdev *ifbdev;
         struct drm_framebuffer *fb;
         struct intel_framebuffer *intel_fb;
         struct drm_mode_fb_cmd mode_cmd;
@@ -127,15 +86,15 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
         int size, ret, mmio_bar = IS_I9XX(dev) ? 0 : 1;
 
         /* we don't do packed 24bpp */
-        if (surface_bpp == 24)
-                surface_bpp = 32;
+        if (sizes->surface_bpp == 24)
+                sizes->surface_bpp = 32;
 
-        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 = ALIGN(mode_cmd.width * ((mode_cmd.bpp + 1) / 8), 64);
-        mode_cmd.depth = surface_depth;
+        mode_cmd.depth = sizes->surface_depth;
 
         size = mode_cmd.pitch * mode_cmd.height;
         size = ALIGN(size, PAGE_SIZE);
@@ -158,28 +117,25 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
         /* Flush everything out, we'll be doing GTT only from now on */
         i915_gem_object_set_to_gtt_domain(fbo, 1);
 
-        ret = intel_framebuffer_create(dev, &mode_cmd, &fb, fbo);
-        if (ret) {
-                DRM_ERROR("failed to allocate fb.\n");
+        info = framebuffer_alloc(sizeof(struct intel_kernel_fbdev), device);
+        if (!info) {
+                ret = -ENOMEM;
                 goto out_unpin;
         }
 
-        list_add(&fb->filp_head, &dev->mode_config.fb_kernel_list);
+        ifbdev = info->par;
+        intel_framebuffer_init(dev, &ifbdev->ifb, &mode_cmd, fbo);
 
-        intel_fb = to_intel_framebuffer(fb);
-        *fb_p = fb;
+        fb = &ifbdev->ifb.base;
 
-        info = framebuffer_alloc(sizeof(struct intelfb_par), device);
-        if (!info) {
-                ret = -ENOMEM;
-                goto out_unpin;
-        }
+        ifbdev->helper.fb = fb;
+        ifbdev->helper.fbdev = info;
+        ifbdev->helper.funcs = &intel_fb_helper_funcs;
+        ifbdev->helper.dev = dev;
 
-        par = info->par;
+        *ifbdev_p = ifbdev;
 
-        par->helper.funcs = &intel_fb_helper_funcs;
-        par->helper.dev = dev;
-        ret = drm_fb_helper_init_crtc_count(&par->helper, 2,
+        ret = drm_fb_helper_init_crtc_count(&ifbdev->helper, 2,
                                             INTELFB_CONN_LIMIT);
         if (ret)
                 goto out_unref;
@@ -214,7 +170,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
 //      memset(info->screen_base, 0, 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, &ifbdev->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, mmio_bar);
@@ -226,15 +182,11 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
         info->pixmap.flags = FB_PIXMAP_SYSTEM;
         info->pixmap.scan_align = 1;
 
-        fb->fbdev = info;
-
-        par->intel_fb = intel_fb;
-
-        /* To allow resizeing without swapping buffers */
         DRM_DEBUG_KMS("allocated %dx%d fb: 0x%08x, bo %p\n",
                         intel_fb->base.width, intel_fb->base.height,
                         obj_priv->gtt_offset, fbo);
 
+
         mutex_unlock(&dev->struct_mutex);
         vga_switcheroo_client_fb_set(dev->pdev, info);
         return 0;
@@ -248,35 +200,76 @@ out:
         return ret;
 }
 
-int intelfb_probe(struct drm_device *dev)
+static int intel_fb_find_or_create_single(struct drm_device *dev,
+                                          struct drm_fb_helper_surface_size *sizes,
+                                          struct drm_fb_helper **fb_ptr)
+{
+        drm_i915_private_t *dev_priv = dev->dev_private;
+        struct intel_kernel_fbdev *ifbdev = NULL;
+        int new_fb = 0;
+        int ret;
+
+        if (!dev_priv->fbdev) {
+                ret = intelfb_create(dev, sizes,
+                                     &ifbdev);
+                if (ret)
+                        return ret;
+
+                dev_priv->fbdev = ifbdev;
+                new_fb = 1;
+        } else {
+                ifbdev = dev_priv->fbdev;
+                if (ifbdev->ifb.base.width < sizes->surface_width ||
+                    ifbdev->ifb.base.height < sizes->surface_height) {
+                        DRM_ERROR("Framebuffer not large enough to scale console onto.\n");
+                        return -EINVAL;
+                }
+        }
+
+        *fb_ptr = &ifbdev->helper;
+        return new_fb;
+}
+
+static int intelfb_probe(struct drm_device *dev)
 {
         int ret;
 
         DRM_DEBUG_KMS("\n");
-        ret = drm_fb_helper_single_fb_probe(dev, 32, intelfb_create);
+        ret = drm_fb_helper_single_fb_probe(dev, 32, intel_fb_find_or_create_single);
         return ret;
 }
-EXPORT_SYMBOL(intelfb_probe);
 
-int intelfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
+int intel_fbdev_destroy(struct drm_device *dev,
+                        struct intel_kernel_fbdev *ifbdev)
 {
         struct fb_info *info;
+        struct intel_framebuffer *ifb = &ifbdev->ifb;
 
-        if (!fb)
-                return -EINVAL;
+        info = ifbdev->helper.fbdev;
 
-        info = fb->fbdev;
+        unregister_framebuffer(info);
+        iounmap(info->screen_base);
+        drm_fb_helper_free(&ifbdev->helper);
 
-        if (info) {
-                struct intelfb_par *par = info->par;
-                unregister_framebuffer(info);
-                iounmap(info->screen_base);
-                if (info->par)
-                        drm_fb_helper_free(&par->helper);
-                framebuffer_release(info);
-        }
+        drm_framebuffer_cleanup(&ifb->base);
+        drm_gem_object_unreference_unlocked(ifb->obj);
+
+        framebuffer_release(info);
 
         return 0;
 }
-EXPORT_SYMBOL(intelfb_remove);
+
+int intel_fbdev_init(struct drm_device *dev)
+{
+        drm_helper_initial_config(dev);
+        intelfb_probe(dev);
+        return 0;
+}
+
+void intel_fbdev_fini(struct drm_device *dev)
+{
+        drm_i915_private_t *dev_priv = dev->dev_private;
+        intel_fbdev_destroy(dev, dev_priv->fbdev);
+        dev_priv->fbdev = NULL;
+}
 MODULE_LICENSE("GPL and additional rights");