drm/kms: move driver specific fb common code to helper functions (v2)
Dave Airlie [Fri, 28 Aug 2009 05:46:53 +0000 (15:46 +1000)]
Initially I always meant this code to be shared, but things
ran away from me before I got to it.

This refactors the i915 and radeon kms fbdev interaction layers
out into generic helpers + driver specific pieces.

It moves all the panic/sysrq enhancements to the core file,
and stores a linked list of kernel fbs. This could possibly be
improved to only store the fb which has fbcon on it for panics
etc.

radeon retains some specific codes used for a big endian
workaround.

changes:
fix oops in v1
fix freeing path for crtc_info

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

drivers/gpu/drm/Makefile
drivers/gpu/drm/drm_fb_helper.c [new file with mode: 0644]
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/radeon/radeon_display.c
drivers/gpu/drm/radeon/radeon_fb.c
drivers/gpu/drm/radeon/radeon_mode.h
include/drm/drm_crtc.h
include/drm/drm_fb_helper.h [new file with mode: 0644]

index 5f0aec4..9907168 100644 (file)
@@ -11,7 +11,8 @@ drm-y       :=        drm_auth.o drm_bufs.o drm_cache.o \
                drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
                drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
                drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \
-               drm_info.o drm_debugfs.o drm_encoder_slave.o
+               drm_info.o drm_debugfs.o drm_encoder_slave.o \
+               drm_fb_helper.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
new file mode 100644 (file)
index 0000000..d6ffea7
--- /dev/null
@@ -0,0 +1,697 @@
+/*
+ * Copyright (c) 2006-2009 Red Hat Inc.
+ * Copyright (c) 2006-2008 Intel Corporation
+ * Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
+ *
+ * DRM framebuffer helper functions
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Authors:
+ *      Dave Airlie <airlied@linux.ie>
+ *      Jesse Barnes <jesse.barnes@intel.com>
+ */
+#include <linux/sysrq.h>
+#include <linux/fb.h>
+#include "drmP.h"
+#include "drm_crtc.h"
+#include "drm_fb_helper.h"
+#include "drm_crtc_helper.h"
+
+static LIST_HEAD(kernel_fb_helper_list);
+
+bool drm_fb_helper_force_kernel_mode(void)
+{
+       int i = 0;
+       bool ret, error = false;
+       struct drm_fb_helper *helper;
+
+       if (list_empty(&kernel_fb_helper_list))
+               return false;
+
+       list_for_each_entry(helper, &kernel_fb_helper_list, kernel_fb_list) {
+               for (i = 0; i < helper->crtc_count; i++) {
+                       struct drm_mode_set *mode_set = &helper->crtc_info[i].mode_set;
+                       ret = drm_crtc_helper_set_config(mode_set);
+                       if (ret)
+                               error = true;
+               }
+       }
+       return error;
+}
+
+int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed,
+                       void *panic_str)
+{
+       DRM_ERROR("panic occurred, switching back to text console\n");
+       return drm_fb_helper_force_kernel_mode();
+       return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_panic);
+
+static struct notifier_block paniced = {
+       .notifier_call = drm_fb_helper_panic,
+};
+
+/**
+ * drm_fb_helper_restore - restore the framebuffer console (kernel) config
+ *
+ * Restore's the kernel's fbcon mode, used for lastclose & panic paths.
+ */
+void drm_fb_helper_restore(void)
+{
+       bool ret;
+       ret = drm_fb_helper_force_kernel_mode();
+       if (ret == true)
+               DRM_ERROR("Failed to restore crtc configuration\n");
+}
+EXPORT_SYMBOL(drm_fb_helper_restore);
+
+static void drm_fb_helper_restore_work_fn(struct work_struct *ignored)
+{
+       drm_fb_helper_restore();
+}
+static DECLARE_WORK(drm_fb_helper_restore_work, drm_fb_helper_restore_work_fn);
+
+static void drm_fb_helper_sysrq(int dummy1, struct tty_struct *dummy3)
+{
+       schedule_work(&drm_fb_helper_restore_work);
+}
+
+static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = {
+       .handler = drm_fb_helper_sysrq,
+       .help_msg = "force-fb(V)",
+       .action_msg = "Restore framebuffer console",
+};
+
+static void drm_fb_helper_on(struct fb_info *info)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_device *dev = fb_helper->dev;
+       struct drm_crtc *crtc;
+       struct drm_encoder *encoder;
+       int i;
+
+       /*
+        * For each CRTC in this fb, turn the crtc on then,
+        * find all associated encoders and turn them on.
+        */
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
+
+               for (i = 0; i < fb_helper->crtc_count; i++) {
+                       if (crtc->base.id == fb_helper->crtc_info[i].crtc_id)
+                               break;
+               }
+
+               mutex_lock(&dev->mode_config.mutex);
+               crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
+               mutex_unlock(&dev->mode_config.mutex);
+
+               /* Found a CRTC on this fb, now find encoders */
+               list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+                       if (encoder->crtc == crtc) {
+                               struct drm_encoder_helper_funcs *encoder_funcs;
+
+                               encoder_funcs = encoder->helper_private;
+                               mutex_lock(&dev->mode_config.mutex);
+                               encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
+                               mutex_unlock(&dev->mode_config.mutex);
+                       }
+               }
+       }
+}
+
+static void drm_fb_helper_off(struct fb_info *info, int dpms_mode)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_device *dev = fb_helper->dev;
+       struct drm_crtc *crtc;
+       struct drm_encoder *encoder;
+       int i;
+
+       /*
+        * For each CRTC in this fb, find all associated encoders
+        * and turn them off, then turn off the CRTC.
+        */
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
+
+               for (i = 0; i < fb_helper->crtc_count; i++) {
+                       if (crtc->base.id == fb_helper->crtc_info[i].crtc_id)
+                               break;
+               }
+
+               /* Found a CRTC on this fb, now find encoders */
+               list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+                       if (encoder->crtc == crtc) {
+                               struct drm_encoder_helper_funcs *encoder_funcs;
+
+                               encoder_funcs = encoder->helper_private;
+                               mutex_lock(&dev->mode_config.mutex);
+                               encoder_funcs->dpms(encoder, dpms_mode);
+                               mutex_unlock(&dev->mode_config.mutex);
+                       }
+               }
+               if (dpms_mode == DRM_MODE_DPMS_OFF) {
+                       mutex_lock(&dev->mode_config.mutex);
+                       crtc_funcs->dpms(crtc, dpms_mode);
+                       mutex_unlock(&dev->mode_config.mutex);
+               }
+       }
+}
+
+int drm_fb_helper_blank(int blank, struct fb_info *info)
+{
+       switch (blank) {
+       case FB_BLANK_UNBLANK:
+               drm_fb_helper_on(info);
+               break;
+       case FB_BLANK_NORMAL:
+               drm_fb_helper_off(info, DRM_MODE_DPMS_STANDBY);
+               break;
+       case FB_BLANK_HSYNC_SUSPEND:
+               drm_fb_helper_off(info, DRM_MODE_DPMS_STANDBY);
+               break;
+       case FB_BLANK_VSYNC_SUSPEND:
+               drm_fb_helper_off(info, DRM_MODE_DPMS_SUSPEND);
+               break;
+       case FB_BLANK_POWERDOWN:
+               drm_fb_helper_off(info, DRM_MODE_DPMS_OFF);
+               break;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_blank);
+
+static void drm_fb_helper_crtc_free(struct drm_fb_helper *helper)
+{
+       int i;
+
+       for (i = 0; i < helper->crtc_count; i++)
+               kfree(helper->crtc_info[i].mode_set.connectors);
+       kfree(helper->crtc_info);
+}
+
+int drm_fb_helper_init_crtc_count(struct drm_fb_helper *helper, int crtc_count, int max_conn_count)
+{
+       struct drm_device *dev = helper->dev;
+       struct drm_crtc *crtc;
+       int ret = 0;
+       int i;
+
+       helper->crtc_info = kcalloc(crtc_count, sizeof(struct drm_fb_helper_crtc), GFP_KERNEL);
+       if (!helper->crtc_info)
+               return -ENOMEM;
+
+       helper->crtc_count = crtc_count;
+
+       for (i = 0; i < crtc_count; i++) {
+               helper->crtc_info[i].mode_set.connectors =
+                       kcalloc(max_conn_count,
+                               sizeof(struct drm_connector *),
+                               GFP_KERNEL);
+
+               if (!helper->crtc_info[i].mode_set.connectors) {
+                       ret = -ENOMEM;
+                       goto out_free;
+               }
+               helper->crtc_info[i].mode_set.num_connectors = 0;
+       }
+
+       i = 0;
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               helper->crtc_info[i].crtc_id = crtc->base.id;
+               helper->crtc_info[i].mode_set.crtc = crtc;
+               i++;
+       }
+       helper->conn_limit = max_conn_count;
+       return 0;
+out_free:
+       drm_fb_helper_crtc_free(helper);
+       return -ENOMEM;
+}
+EXPORT_SYMBOL(drm_fb_helper_init_crtc_count);
+
+int drm_fb_helper_setcolreg(unsigned regno,
+                           unsigned red,
+                           unsigned green,
+                           unsigned blue,
+                           unsigned transp,
+                           struct fb_info *info)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_device *dev = fb_helper->dev;
+       struct drm_crtc *crtc;
+       int i;
+
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               struct drm_framebuffer *fb = fb_helper->fb;
+
+               for (i = 0; i < fb_helper->crtc_count; i++) {
+                       if (crtc->base.id == fb_helper->crtc_info[i].crtc_id)
+                               break;
+               }
+               if (i == fb_helper->crtc_count)
+                       continue;
+
+               if (regno > 255)
+                       return 1;
+
+               if (fb->depth == 8) {
+                       fb_helper->funcs->gamma_set(crtc, red, green, blue, regno);
+                       return 0;
+               }
+
+               if (regno < 16) {
+                       switch (fb->depth) {
+                       case 15:
+                               fb->pseudo_palette[regno] = ((red & 0xf800) >> 1) |
+                                       ((green & 0xf800) >>  6) |
+                                       ((blue & 0xf800) >> 11);
+                               break;
+                       case 16:
+                               fb->pseudo_palette[regno] = (red & 0xf800) |
+                                       ((green & 0xfc00) >>  5) |
+                                       ((blue  & 0xf800) >> 11);
+                               break;
+                       case 24:
+                       case 32:
+                               fb->pseudo_palette[regno] =
+                                       (((red >> 8) & 0xff) << info->var.red.offset) |
+                                       (((green >> 8) & 0xff) << info->var.green.offset) |
+                                       (((blue >> 8) & 0xff) << info->var.blue.offset);
+                               break;
+                       }
+               }
+       }
+       return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_setcolreg);
+
+int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
+                           struct fb_info *info)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_framebuffer *fb = fb_helper->fb;
+       int depth;
+
+       if (var->pixclock == -1 || !var->pixclock)
+               return -EINVAL;
+
+       /* Need to resize the fb object !!! */
+       if (var->xres > fb->width || var->yres > fb->height) {
+               DRM_ERROR("Requested width/height is greater than current fb "
+                          "object %dx%d > %dx%d\n", var->xres, var->yres,
+                          fb->width, fb->height);
+               DRM_ERROR("Need resizing code.\n");
+               return -EINVAL;
+       }
+
+       switch (var->bits_per_pixel) {
+       case 16:
+               depth = (var->green.length == 6) ? 16 : 15;
+               break;
+       case 32:
+               depth = (var->transp.length > 0) ? 32 : 24;
+               break;
+       default:
+               depth = var->bits_per_pixel;
+               break;
+       }
+
+       switch (depth) {
+       case 8:
+               var->red.offset = 0;
+               var->green.offset = 0;
+               var->blue.offset = 0;
+               var->red.length = 8;
+               var->green.length = 8;
+               var->blue.length = 8;
+               var->transp.length = 0;
+               var->transp.offset = 0;
+               break;
+       case 15:
+               var->red.offset = 10;
+               var->green.offset = 5;
+               var->blue.offset = 0;
+               var->red.length = 5;
+               var->green.length = 5;
+               var->blue.length = 5;
+               var->transp.length = 1;
+               var->transp.offset = 15;
+               break;
+       case 16:
+               var->red.offset = 11;
+               var->green.offset = 5;
+               var->blue.offset = 0;
+               var->red.length = 5;
+               var->green.length = 6;
+               var->blue.length = 5;
+               var->transp.length = 0;
+               var->transp.offset = 0;
+               break;
+       case 24:
+               var->red.offset = 16;
+               var->green.offset = 8;
+               var->blue.offset = 0;
+               var->red.length = 8;
+               var->green.length = 8;
+               var->blue.length = 8;
+               var->transp.length = 0;
+               var->transp.offset = 0;
+               break;
+       case 32:
+               var->red.offset = 16;
+               var->green.offset = 8;
+               var->blue.offset = 0;
+               var->red.length = 8;
+               var->green.length = 8;
+               var->blue.length = 8;
+               var->transp.length = 8;
+               var->transp.offset = 24;
+               break;
+       default:
+               return -EINVAL;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_check_var);
+
+/* this will let fbcon do the mode init */
+int drm_fb_helper_set_par(struct fb_info *info)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_device *dev = fb_helper->dev;
+       struct fb_var_screeninfo *var = &info->var;
+       struct drm_crtc *crtc;
+       int ret;
+       int i;
+
+       if (var->pixclock != -1) {
+               DRM_ERROR("PIXEL CLCOK SET\n");
+               return -EINVAL;
+       }
+
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+
+               for (i = 0; i < fb_helper->crtc_count; i++) {
+                       if (crtc->base.id == fb_helper->crtc_info[i].crtc_id)
+                               break;
+               }
+               if (i == fb_helper->crtc_count)
+                       continue;
+
+               if (crtc->fb == fb_helper->crtc_info[i].mode_set.fb) {
+                       mutex_lock(&dev->mode_config.mutex);
+                       ret = crtc->funcs->set_config(&fb_helper->crtc_info->mode_set);
+                       mutex_unlock(&dev->mode_config.mutex);
+                       if (ret)
+                               return ret;
+               }
+       }
+       return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_set_par);
+
+int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
+                             struct fb_info *info)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_device *dev = fb_helper->dev;
+       struct drm_mode_set *modeset;
+       struct drm_crtc *crtc;
+       int ret = 0;
+       int i;
+
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               for (i = 0; i < fb_helper->crtc_count; i++) {
+                       if (crtc->base.id == fb_helper->crtc_info[i].crtc_id)
+                               break;
+               }
+
+               if (i == fb_helper->crtc_count)
+                       continue;
+
+               modeset = &fb_helper->crtc_info[i].mode_set;
+
+               modeset->x = var->xoffset;
+               modeset->y = var->yoffset;
+
+               if (modeset->num_connectors) {
+                       mutex_lock(&dev->mode_config.mutex);
+                       ret = crtc->funcs->set_config(modeset);
+                       mutex_unlock(&dev->mode_config.mutex);
+                       if (!ret) {
+                               info->var.xoffset = var->xoffset;
+                               info->var.yoffset = var->yoffset;
+                       }
+               }
+       }
+       return ret;
+}
+EXPORT_SYMBOL(drm_fb_helper_pan_display);
+
+int drm_fb_helper_single_fb_probe(struct drm_device *dev,
+                                 int (*fb_create)(struct drm_device *dev,
+                                                  uint32_t fb_width,
+                                                  uint32_t fb_height,
+                                                  uint32_t surface_width,
+                                                  uint32_t surface_height,
+                                                  struct drm_framebuffer **fb_ptr))
+{
+       struct drm_crtc *crtc;
+       struct drm_connector *connector;
+       unsigned int fb_width = (unsigned)-1, fb_height = (unsigned)-1;
+       unsigned int surface_width = 0, surface_height = 0;
+       int new_fb = 0;
+       int crtc_count = 0;
+       int ret, i, conn_count = 0;
+       struct fb_info *info;
+       struct drm_framebuffer *fb;
+       struct drm_mode_set *modeset = NULL;
+       struct drm_fb_helper *fb_helper;
+
+       /* first up get a count of crtcs now in use and new min/maxes width/heights */
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               if (drm_helper_crtc_in_use(crtc)) {
+                       if (crtc->desired_mode) {
+                               if (crtc->desired_mode->hdisplay < fb_width)
+                                       fb_width = crtc->desired_mode->hdisplay;
+
+                               if (crtc->desired_mode->vdisplay < fb_height)
+                                       fb_height = crtc->desired_mode->vdisplay;
+
+                               if (crtc->desired_mode->hdisplay > surface_width)
+                                       surface_width = crtc->desired_mode->hdisplay;
+
+                               if (crtc->desired_mode->vdisplay > surface_height)
+                                       surface_height = crtc->desired_mode->vdisplay;
+                       }
+                       crtc_count++;
+               }
+       }
+
+       if (crtc_count == 0 || fb_width == -1 || fb_height == -1) {
+               /* hmm everyone went away - assume VGA cable just fell out
+                  and will come back later. */
+               return 0;
+       }
+
+       /* do we have an fb already? */
+       if (list_empty(&dev->mode_config.fb_kernel_list)) {
+               ret = (*fb_create)(dev, fb_width, fb_height, surface_width,
+                                  surface_height, &fb);
+               if (ret)
+                       return -EINVAL;
+               new_fb = 1;
+       } else {
+               fb = list_first_entry(&dev->mode_config.fb_kernel_list,
+                                     struct drm_framebuffer, filp_head);
+
+               /* if someone hotplugs something bigger than we have already allocated, we are pwned.
+                  As really we can't resize an fbdev that is in the wild currently due to fbdev
+                  not really being designed for the lower layers moving stuff around under it.
+                  - so in the grand style of things - punt. */
+               if ((fb->width < surface_width) ||
+                   (fb->height < surface_height)) {
+                       DRM_ERROR("Framebuffer not large enough to scale console onto.\n");
+                       return -EINVAL;
+               }
+       }
+
+       info = fb->fbdev;
+       fb_helper = info->par;
+
+       crtc_count = 0;
+       /* okay we need to setup new connector sets in the crtcs */
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               modeset = &fb_helper->crtc_info[crtc_count].mode_set;
+               modeset->fb = fb;
+               conn_count = 0;
+               list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+                       if (connector->encoder)
+                               if (connector->encoder->crtc == modeset->crtc) {
+                                       modeset->connectors[conn_count] = connector;
+                                       conn_count++;
+                                       if (conn_count > fb_helper->conn_limit)
+                                               BUG();
+                               }
+               }
+
+               for (i = conn_count; i < fb_helper->conn_limit; i++)
+                       modeset->connectors[i] = NULL;
+
+               modeset->crtc = crtc;
+               crtc_count++;
+
+               modeset->num_connectors = conn_count;
+               if (modeset->crtc->desired_mode) {
+                       if (modeset->mode)
+                               drm_mode_destroy(dev, modeset->mode);
+                       modeset->mode = drm_mode_duplicate(dev,
+                                                          modeset->crtc->desired_mode);
+               }
+       }
+       fb_helper->crtc_count = crtc_count;
+       fb_helper->fb = fb;
+
+       if (new_fb) {
+               info->var.pixclock = -1;
+               if (register_framebuffer(info) < 0)
+                       return -EINVAL;
+       } else {
+               drm_fb_helper_set_par(info);
+       }
+       printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node,
+              info->fix.id);
+
+       /* Switch back to kernel console on panic */
+       /* multi card linked list maybe */
+       if (list_empty(&kernel_fb_helper_list)) {
+               printk(KERN_INFO "registered panic notifier\n");
+               atomic_notifier_chain_register(&panic_notifier_list,
+                                              &paniced);
+               register_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
+       }
+       list_add(&fb_helper->kernel_fb_list, &kernel_fb_helper_list);
+       return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_single_fb_probe);
+
+void drm_fb_helper_free(struct drm_fb_helper *helper)
+{
+       list_del(&helper->kernel_fb_list);
+       if (list_empty(&kernel_fb_helper_list)) {
+               printk(KERN_INFO "unregistered panic notifier\n");
+               atomic_notifier_chain_unregister(&panic_notifier_list,
+                                                &paniced);
+               unregister_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
+       }
+       drm_fb_helper_crtc_free(helper);
+}
+EXPORT_SYMBOL(drm_fb_helper_free);
+
+void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch)
+{
+       info->fix.type = FB_TYPE_PACKED_PIXELS;
+       info->fix.visual = FB_VISUAL_TRUECOLOR;
+       info->fix.type_aux = 0;
+       info->fix.xpanstep = 1; /* doing it in hw */
+       info->fix.ypanstep = 1; /* doing it in hw */
+       info->fix.ywrapstep = 0;
+       info->fix.accel = FB_ACCEL_I830;
+       info->fix.type_aux = 0;
+
+       info->fix.line_length = pitch;
+       return;
+}
+EXPORT_SYMBOL(drm_fb_helper_fill_fix);
+
+void drm_fb_helper_fill_var(struct fb_info *info, struct drm_framebuffer *fb,
+                           uint32_t fb_width, uint32_t fb_height)
+{
+       info->pseudo_palette = fb->pseudo_palette;
+       info->var.xres_virtual = fb->width;
+       info->var.yres_virtual = fb->height;
+       info->var.bits_per_pixel = fb->bits_per_pixel;
+       info->var.xoffset = 0;
+       info->var.yoffset = 0;
+       info->var.activate = FB_ACTIVATE_NOW;
+       info->var.height = -1;
+       info->var.width = -1;
+
+       switch (fb->depth) {
+       case 8:
+               info->var.red.offset = 0;
+               info->var.green.offset = 0;
+               info->var.blue.offset = 0;
+               info->var.red.length = 8; /* 8bit DAC */
+               info->var.green.length = 8;
+               info->var.blue.length = 8;
+               info->var.transp.offset = 0;
+               info->var.transp.length = 0;
+               break;
+       case 15:
+               info->var.red.offset = 10;
+               info->var.green.offset = 5;
+               info->var.blue.offset = 0;
+               info->var.red.length = 5;
+               info->var.green.length = 5;
+               info->var.blue.length = 5;
+               info->var.transp.offset = 15;
+               info->var.transp.length = 1;
+               break;
+       case 16:
+               info->var.red.offset = 11;
+               info->var.green.offset = 5;
+               info->var.blue.offset = 0;
+               info->var.red.length = 5;
+               info->var.green.length = 6;
+               info->var.blue.length = 5;
+               info->var.transp.offset = 0;
+               break;
+       case 24:
+               info->var.red.offset = 16;
+               info->var.green.offset = 8;
+               info->var.blue.offset = 0;
+               info->var.red.length = 8;
+               info->var.green.length = 8;
+               info->var.blue.length = 8;
+               info->var.transp.offset = 0;
+               info->var.transp.length = 0;
+               break;
+       case 32:
+               info->var.red.offset = 16;
+               info->var.green.offset = 8;
+               info->var.blue.offset = 0;
+               info->var.red.length = 8;
+               info->var.green.length = 8;
+               info->var.blue.length = 8;
+               info->var.transp.offset = 24;
+               info->var.transp.length = 8;
+               break;
+       default:
+               break;
+       }
+
+       info->var.xres = fb_width;
+       info->var.yres = fb_height;
+}
+EXPORT_SYMBOL(drm_fb_helper_fill_var);
index 544d889..c628c36 100644 (file)
@@ -29,6 +29,7 @@
 #include "drmP.h"
 #include "drm.h"
 #include "drm_crtc_helper.h"
+#include "drm_fb_helper.h"
 #include "intel_drv.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
@@ -1347,7 +1348,7 @@ void i915_driver_lastclose(struct drm_device * dev)
        drm_i915_private_t *dev_priv = dev->dev_private;
 
        if (!dev_priv || drm_core_check_feature(dev, DRIVER_MODESET)) {
-               intelfb_restore();
+               drm_fb_helper_restore();
                return;
        }
 
index d6fce21..5fb7a4f 100644 (file)
@@ -3060,8 +3060,6 @@ static void intel_crtc_destroy(struct drm_crtc *crtc)
 {
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 
-       if (intel_crtc->mode_set.mode)
-               drm_mode_destroy(crtc->dev, intel_crtc->mode_set.mode);
        drm_crtc_cleanup(crtc);
        kfree(intel_crtc);
 }
@@ -3107,16 +3105,6 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
        intel_crtc->cursor_addr = 0;
        intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF;
        drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);
-
-       intel_crtc->mode_set.crtc = &intel_crtc->base;
-       intel_crtc->mode_set.connectors = (struct drm_connector **)(intel_crtc + 1);
-       intel_crtc->mode_set.num_connectors = 0;
-
-       if (i915_fbpercrtc) {
-
-
-
-       }
 }
 
 int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
index d6f92ea..38910f8 100644 (file)
@@ -96,9 +96,6 @@ struct intel_crtc {
        uint32_t cursor_addr;
        u8 lut_r[256], lut_g[256], lut_b[256];
        int dpms_mode;
-       struct intel_framebuffer *fbdev_fb;
-       /* a mode_set for fbdev users on this crtc */
-       struct drm_mode_set mode_set;
 };
 
 #define to_intel_crtc(x) container_of(x, struct intel_crtc, base)
index 1d30802..3041530 100644 (file)
 #include "drmP.h"
 #include "drm.h"
 #include "drm_crtc.h"
+#include "drm_fb_helper.h"
 #include "intel_drv.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 
 struct intelfb_par {
-       struct drm_device *dev;
-       struct drm_display_mode *our_mode;
+       struct drm_fb_helper helper;
        struct intel_framebuffer *intel_fb;
-       int crtc_count;
-       /* crtc currently bound to this */
-       uint32_t crtc_ids[2];
+       struct drm_display_mode *our_mode;
 };
 
-static int intelfb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                       unsigned blue, unsigned transp,
-                       struct fb_info *info)
-{
-       struct intelfb_par *par = info->par;
-       struct drm_device *dev = par->dev;
-       struct drm_crtc *crtc;
-       int i;
-
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-               struct drm_mode_set *modeset = &intel_crtc->mode_set;
-               struct drm_framebuffer *fb = modeset->fb;
-
-               for (i = 0; i < par->crtc_count; i++)
-                       if (crtc->base.id == par->crtc_ids[i])
-                               break;
-
-               if (i == par->crtc_count)
-                       continue;
-
-
-               if (regno > 255)
-                       return 1;
-
-               if (fb->depth == 8) {
-                       intel_crtc_fb_gamma_set(crtc, red, green, blue, regno);
-                       return 0;
-               }
-
-               if (regno < 16) {
-                       switch (fb->depth) {
-                       case 15:
-                               fb->pseudo_palette[regno] = ((red & 0xf800) >> 1) |
-                                       ((green & 0xf800) >>  6) |
-                                       ((blue & 0xf800) >> 11);
-                               break;
-                       case 16:
-                               fb->pseudo_palette[regno] = (red & 0xf800) |
-                                       ((green & 0xfc00) >>  5) |
-                                       ((blue  & 0xf800) >> 11);
-                               break;
-                       case 24:
-                       case 32:
-                               fb->pseudo_palette[regno] = ((red & 0xff00) << 8) |
-                                       (green & 0xff00) |
-                                       ((blue  & 0xff00) >> 8);
-                               break;
-                       }
-               }
-       }
-       return 0;
-}
-
-static int intelfb_check_var(struct fb_var_screeninfo *var,
-                       struct fb_info *info)
-{
-       struct intelfb_par *par = info->par;
-       struct intel_framebuffer *intel_fb = par->intel_fb;
-       struct drm_framebuffer *fb = &intel_fb->base;
-       int depth;
-
-       if (var->pixclock == -1 || !var->pixclock)
-               return -EINVAL;
-
-       /* Need to resize the fb object !!! */
-       if (var->xres > fb->width || var->yres > fb->height) {
-               DRM_ERROR("Requested width/height is greater than current fb object %dx%d > %dx%d\n",var->xres,var->yres,fb->width,fb->height);
-               DRM_ERROR("Need resizing code.\n");
-               return -EINVAL;
-       }
-
-       switch (var->bits_per_pixel) {
-       case 16:
-               depth = (var->green.length == 6) ? 16 : 15;
-               break;
-       case 32:
-               depth = (var->transp.length > 0) ? 32 : 24;
-               break;
-       default:
-               depth = var->bits_per_pixel;
-               break;
-       }
-
-       switch (depth) {
-       case 8:
-               var->red.offset = 0;
-               var->green.offset = 0;
-               var->blue.offset = 0;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-       case 15:
-               var->red.offset = 10;
-               var->green.offset = 5;
-               var->blue.offset = 0;
-               var->red.length = 5;
-               var->green.length = 5;
-               var->blue.length = 5;
-               var->transp.length = 1;
-               var->transp.offset = 15;
-               break;
-       case 16:
-               var->red.offset = 11;
-               var->green.offset = 5;
-               var->blue.offset = 0;
-               var->red.length = 5;
-               var->green.length = 6;
-               var->blue.length = 5;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-       case 24:
-               var->red.offset = 16;
-               var->green.offset = 8;
-               var->blue.offset = 0;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-       case 32:
-               var->red.offset = 16;
-               var->green.offset = 8;
-               var->blue.offset = 0;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 8;
-               var->transp.offset = 24;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-/* this will let fbcon do the mode init */
-/* FIXME: take mode config lock? */
-static int intelfb_set_par(struct fb_info *info)
-{
-       struct intelfb_par *par = info->par;
-       struct drm_device *dev = par->dev;
-       struct fb_var_screeninfo *var = &info->var;
-       int i;
-
-       DRM_DEBUG("%d %d\n", var->xres, var->pixclock);
-
-       if (var->pixclock != -1) {
-
-               DRM_ERROR("PIXEL CLOCK SET\n");
-               return -EINVAL;
-       } else {
-               struct drm_crtc *crtc;
-               int ret;
-
-               list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-                       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-
-                       for (i = 0; i < par->crtc_count; i++)
-                               if (crtc->base.id == par->crtc_ids[i])
-                                       break;
-
-                       if (i == par->crtc_count)
-                               continue;
-
-                       if (crtc->fb == intel_crtc->mode_set.fb) {
-                               mutex_lock(&dev->mode_config.mutex);
-                               ret = crtc->funcs->set_config(&intel_crtc->mode_set);
-                               mutex_unlock(&dev->mode_config.mutex);
-                               if (ret)
-                                       return ret;
-                       }
-               }
-               return 0;
-       }
-}
-
-static int intelfb_pan_display(struct fb_var_screeninfo *var,
-                               struct fb_info *info)
-{
-       struct intelfb_par *par = info->par;
-       struct drm_device *dev = par->dev;
-       struct drm_mode_set *modeset;
-       struct drm_crtc *crtc;
-       struct intel_crtc *intel_crtc;
-       int ret = 0;
-       int i;
-
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               for (i = 0; i < par->crtc_count; i++)
-                       if (crtc->base.id == par->crtc_ids[i])
-                               break;
-
-               if (i == par->crtc_count)
-                       continue;
-
-               intel_crtc = to_intel_crtc(crtc);
-               modeset = &intel_crtc->mode_set;
-
-               modeset->x = var->xoffset;
-               modeset->y = var->yoffset;
-
-               if (modeset->num_connectors) {
-                       mutex_lock(&dev->mode_config.mutex);
-                       ret = crtc->funcs->set_config(modeset);
-                       mutex_unlock(&dev->mode_config.mutex);
-                       if (!ret) {
-                               info->var.xoffset = var->xoffset;
-                               info->var.yoffset = var->yoffset;
-                       }
-               }
-       }
-
-       return ret;
-}
-
-static void intelfb_on(struct fb_info *info)
-{
-       struct intelfb_par *par = info->par;
-       struct drm_device *dev = par->dev;
-       struct drm_crtc *crtc;
-       struct drm_encoder *encoder;
-       int i;
-
-       /*
-        * For each CRTC in this fb, find all associated encoders
-        * and turn them off, then turn off the CRTC.
-        */
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-
-               for (i = 0; i < par->crtc_count; i++)
-                       if (crtc->base.id == par->crtc_ids[i])
-                               break;
-
-               crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-
-               /* Found a CRTC on this fb, now find encoders */
-               list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                       if (encoder->crtc == crtc) {
-                               struct drm_encoder_helper_funcs *encoder_funcs;
-                               encoder_funcs = encoder->helper_private;
-                               encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
-                       }
-               }
-       }
-}
-
-static void intelfb_off(struct fb_info *info, int dpms_mode)
-{
-       struct intelfb_par *par = info->par;
-       struct drm_device *dev = par->dev;
-       struct drm_crtc *crtc;
-       struct drm_encoder *encoder;
-       int i;
-
-       /*
-        * For each CRTC in this fb, find all associated encoders
-        * and turn them off, then turn off the CRTC.
-        */
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-
-               for (i = 0; i < par->crtc_count; i++)
-                       if (crtc->base.id == par->crtc_ids[i])
-                               break;
-
-               /* Found a CRTC on this fb, now find encoders */
-               list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                       if (encoder->crtc == crtc) {
-                               struct drm_encoder_helper_funcs *encoder_funcs;
-                               encoder_funcs = encoder->helper_private;
-                               encoder_funcs->dpms(encoder, dpms_mode);
-                       }
-               }
-               if (dpms_mode == DRM_MODE_DPMS_OFF)
-                       crtc_funcs->dpms(crtc, dpms_mode);
-       }
-}
-
-static int intelfb_blank(int blank, struct fb_info *info)
-{
-       switch (blank) {
-       case FB_BLANK_UNBLANK:
-               intelfb_on(info);
-               break;
-       case FB_BLANK_NORMAL:
-               intelfb_off(info, DRM_MODE_DPMS_STANDBY);
-               break;
-       case FB_BLANK_HSYNC_SUSPEND:
-               intelfb_off(info, DRM_MODE_DPMS_STANDBY);
-               break;
-       case FB_BLANK_VSYNC_SUSPEND:
-               intelfb_off(info, DRM_MODE_DPMS_SUSPEND);
-               break;
-       case FB_BLANK_POWERDOWN:
-               intelfb_off(info, DRM_MODE_DPMS_OFF);
-               break;
-       }
-       return 0;
-}
-
 static struct fb_ops intelfb_ops = {
        .owner = THIS_MODULE,
-       .fb_check_var = intelfb_check_var,
-       .fb_set_par = intelfb_set_par,
-       .fb_setcolreg = intelfb_setcolreg,
+       .fb_check_var = drm_fb_helper_check_var,
+       .fb_set_par = drm_fb_helper_set_par,
+       .fb_setcolreg = drm_fb_helper_setcolreg,
        .fb_fillrect = cfb_fillrect,
        .fb_copyarea = cfb_copyarea,
        .fb_imageblit = cfb_imageblit,
-       .fb_pan_display = intelfb_pan_display,
-       .fb_blank = intelfb_blank,
+       .fb_pan_display = drm_fb_helper_pan_display,
+       .fb_blank = drm_fb_helper_blank,
 };
 
+static struct drm_fb_helper_funcs intel_fb_helper_funcs = {
+       .gamma_set = intel_crtc_fb_gamma_set,
+};
+
+
 /**
  * Curretly it is assumed that the old framebuffer is reused.
  *
@@ -412,25 +107,10 @@ int intelfb_resize(struct drm_device *dev, struct drm_crtc *crtc)
 }
 EXPORT_SYMBOL(intelfb_resize);
 
-static struct drm_mode_set kernelfb_mode;
-
-static int intelfb_panic(struct notifier_block *n, unsigned long ununsed,
-                        void *panic_str)
-{
-       DRM_ERROR("panic occurred, switching back to text console\n");
-
-       intelfb_restore();
-       return 0;
-}
-
-static struct notifier_block paniced = {
-       .notifier_call = intelfb_panic,
-};
-
 static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
                          uint32_t fb_height, uint32_t surface_width,
                          uint32_t surface_height,
-                         struct intel_framebuffer **intel_fb_p)
+                         struct drm_framebuffer **fb_p)
 {
        struct fb_info *info;
        struct intelfb_par *par;
@@ -479,7 +159,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
        list_add(&fb->filp_head, &dev->mode_config.fb_kernel_list);
 
        intel_fb = to_intel_framebuffer(fb);
-       *intel_fb_p = intel_fb;
+       *fb_p = fb;
 
        info = framebuffer_alloc(sizeof(struct intelfb_par), device);
        if (!info) {
@@ -489,21 +169,19 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
 
        par = info->par;
 
+       par->helper.funcs = &intel_fb_helper_funcs;
+       par->helper.dev = dev;
+       ret = drm_fb_helper_init_crtc_count(&par->helper, 2,
+                                           INTELFB_CONN_LIMIT);
+       if (ret)
+               goto out_unref;
+
        strcpy(info->fix.id, "inteldrmfb");
-       info->fix.type = FB_TYPE_PACKED_PIXELS;
-       info->fix.visual = FB_VISUAL_TRUECOLOR;
-       info->fix.type_aux = 0;
-       info->fix.xpanstep = 1; /* doing it in hw */
-       info->fix.ypanstep = 1; /* doing it in hw */
-       info->fix.ywrapstep = 0;
-       info->fix.accel = FB_ACCEL_I830;
-       info->fix.type_aux = 0;
 
        info->flags = FBINFO_DEFAULT;
 
        info->fbops = &intelfb_ops;
 
-       info->fix.line_length = fb->pitch;
 
        /* setup aperture base/size for vesafb takeover */
        info->aperture_base = dev->mode_config.fb_base;
@@ -527,18 +205,8 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
 
 //     memset(info->screen_base, 0, size);
 
-       info->pseudo_palette = fb->pseudo_palette;
-       info->var.xres_virtual = fb->width;
-       info->var.yres_virtual = fb->height;
-       info->var.bits_per_pixel = fb->bits_per_pixel;
-       info->var.xoffset = 0;
-       info->var.yoffset = 0;
-       info->var.activate = FB_ACTIVATE_NOW;
-       info->var.height = -1;
-       info->var.width = -1;
-
-       info->var.xres = fb_width;
-       info->var.yres = fb_height;
+       drm_fb_helper_fill_fix(info, fb->depth);
+       drm_fb_helper_fill_var(info, fb, fb_width, fb_height);
 
        /* FIXME: we really shouldn't expose mmio space at all */
        info->fix.mmio_start = pci_resource_start(dev->pdev, mmio_bar);
@@ -550,64 +218,9 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
        info->pixmap.flags = FB_PIXMAP_SYSTEM;
        info->pixmap.scan_align = 1;
 
-       switch(fb->depth) {
-       case 8:
-               info->var.red.offset = 0;
-               info->var.green.offset = 0;
-               info->var.blue.offset = 0;
-               info->var.red.length = 8; /* 8bit DAC */
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 0;
-               info->var.transp.length = 0;
-               break;
-       case 15:
-               info->var.red.offset = 10;
-               info->var.green.offset = 5;
-               info->var.blue.offset = 0;
-               info->var.red.length = 5;
-               info->var.green.length = 5;
-               info->var.blue.length = 5;
-               info->var.transp.offset = 15;
-               info->var.transp.length = 1;
-               break;
-       case 16:
-               info->var.red.offset = 11;
-               info->var.green.offset = 5;
-               info->var.blue.offset = 0;
-               info->var.red.length = 5;
-               info->var.green.length = 6;
-               info->var.blue.length = 5;
-               info->var.transp.offset = 0;
-               break;
-       case 24:
-               info->var.red.offset = 16;
-               info->var.green.offset = 8;
-               info->var.blue.offset = 0;
-               info->var.red.length = 8;
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 0;
-               info->var.transp.length = 0;
-               break;
-       case 32:
-               info->var.red.offset = 16;
-               info->var.green.offset = 8;
-               info->var.blue.offset = 0;
-               info->var.red.length = 8;
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 24;
-               info->var.transp.length = 8;
-               break;
-       default:
-               break;
-       }
-
        fb->fbdev = info;
 
        par->intel_fb = intel_fb;
-       par->dev = dev;
 
        /* To allow resizeing without swapping buffers */
        DRM_DEBUG("allocated %dx%d fb: 0x%08x, bo %p\n", intel_fb->base.width,
@@ -625,307 +238,12 @@ out:
        return ret;
 }
 
-static int intelfb_multi_fb_probe_crtc(struct drm_device *dev, struct drm_crtc *crtc)
-{
-       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-       struct intel_framebuffer *intel_fb;
-       struct drm_framebuffer *fb;
-       struct drm_connector *connector;
-       struct fb_info *info;
-       struct intelfb_par *par;
-       struct drm_mode_set *modeset;
-       unsigned int width, height;
-       int new_fb = 0;
-       int ret, i, conn_count;
-
-       if (!drm_helper_crtc_in_use(crtc))
-               return 0;
-
-       if (!crtc->desired_mode)
-               return 0;
-
-       width = crtc->desired_mode->hdisplay;
-       height = crtc->desired_mode->vdisplay;
-
-       /* is there an fb bound to this crtc already */
-       if (!intel_crtc->mode_set.fb) {
-               ret = intelfb_create(dev, width, height, width, height, &intel_fb);
-               if (ret)
-                       return -EINVAL;
-               new_fb = 1;
-       } else {
-               fb = intel_crtc->mode_set.fb;
-               intel_fb = to_intel_framebuffer(fb);
-               if ((intel_fb->base.width < width) || (intel_fb->base.height < height))
-                       return -EINVAL;
-       }
-
-       info = intel_fb->base.fbdev;
-       par = info->par;
-
-       modeset = &intel_crtc->mode_set;
-       modeset->fb = &intel_fb->base;
-       conn_count = 0;
-       list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-               if (connector->encoder)
-                       if (connector->encoder->crtc == modeset->crtc) {
-                               modeset->connectors[conn_count] = connector;
-                               conn_count++;
-                               if (conn_count > INTELFB_CONN_LIMIT)
-                                       BUG();
-                       }
-       }
-
-       for (i = conn_count; i < INTELFB_CONN_LIMIT; i++)
-               modeset->connectors[i] = NULL;
-
-       par->crtc_ids[0] = crtc->base.id;
-
-       modeset->num_connectors = conn_count;
-       if (modeset->crtc->desired_mode) {
-               if (modeset->mode)
-                       drm_mode_destroy(dev, modeset->mode);
-               modeset->mode = drm_mode_duplicate(dev,
-                                                  modeset->crtc->desired_mode);
-       }
-
-       par->crtc_count = 1;
-
-       if (new_fb) {
-               info->var.pixclock = -1;
-               if (register_framebuffer(info) < 0)
-                       return -EINVAL;
-       } else
-               intelfb_set_par(info);
-
-       DRM_INFO("fb%d: %s frame buffer device\n", info->node,
-              info->fix.id);
-
-       /* Switch back to kernel console on panic */
-       kernelfb_mode = *modeset;
-       atomic_notifier_chain_register(&panic_notifier_list, &paniced);
-       DRM_DEBUG("registered panic notifier\n");
-
-       return 0;
-}
-
-static int intelfb_multi_fb_probe(struct drm_device *dev)
-{
-
-       struct drm_crtc *crtc;
-       int ret = 0;
-
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               ret = intelfb_multi_fb_probe_crtc(dev, crtc);
-               if (ret)
-                       return ret;
-       }
-       return ret;
-}
-
-static int intelfb_single_fb_probe(struct drm_device *dev)
-{
-       struct drm_crtc *crtc;
-       struct drm_connector *connector;
-       unsigned int fb_width = (unsigned)-1, fb_height = (unsigned)-1;
-       unsigned int surface_width = 0, surface_height = 0;
-       int new_fb = 0;
-       int crtc_count = 0;
-       int ret, i, conn_count = 0;
-       struct intel_framebuffer *intel_fb;
-       struct fb_info *info;
-       struct intelfb_par *par;
-       struct drm_mode_set *modeset = NULL;
-
-       DRM_DEBUG("\n");
-
-       /* Get a count of crtcs now in use and new min/maxes width/heights */
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               if (!drm_helper_crtc_in_use(crtc))
-                       continue;
-
-               crtc_count++;
-               if (!crtc->desired_mode)
-                       continue;
-
-               /* Smallest mode determines console size... */
-               if (crtc->desired_mode->hdisplay < fb_width)
-                       fb_width = crtc->desired_mode->hdisplay;
-
-               if (crtc->desired_mode->vdisplay < fb_height)
-                       fb_height = crtc->desired_mode->vdisplay;
-
-               /* ... but largest for memory allocation dimensions */
-               if (crtc->desired_mode->hdisplay > surface_width)
-                       surface_width = crtc->desired_mode->hdisplay;
-
-               if (crtc->desired_mode->vdisplay > surface_height)
-                       surface_height = crtc->desired_mode->vdisplay;
-       }
-
-       if (crtc_count == 0 || fb_width == -1 || fb_height == -1) {
-               /* hmm everyone went away - assume VGA cable just fell out
-                  and will come back later. */
-               DRM_DEBUG("no CRTCs available?\n");
-               return 0;
-       }
-
-//fail
-       /* Find the fb for our new config */
-       if (list_empty(&dev->mode_config.fb_kernel_list)) {
-               DRM_DEBUG("creating new fb (console size %dx%d, "
-                         "buffer size %dx%d)\n", fb_width, fb_height,
-                         surface_width, surface_height);
-               ret = intelfb_create(dev, fb_width, fb_height, surface_width,
-                                    surface_height, &intel_fb);
-               if (ret)
-                       return -EINVAL;
-               new_fb = 1;
-       } else {
-               struct drm_framebuffer *fb;
-
-               fb = list_first_entry(&dev->mode_config.fb_kernel_list,
-                                     struct drm_framebuffer, filp_head);
-               intel_fb = to_intel_framebuffer(fb);
-
-               /* if someone hotplugs something bigger than we have already
-                * allocated, we are pwned.  As really we can't resize an
-                * fbdev that is in the wild currently due to fbdev not really
-                * being designed for the lower layers moving stuff around
-                * under it.
-                * - so in the grand style of things - punt.
-                */
-               if ((fb->width < surface_width) ||
-                   (fb->height < surface_height)) {
-                       DRM_ERROR("fb not large enough for console\n");
-                       return -EINVAL;
-               }
-       }
-// fail
-
-       info = intel_fb->base.fbdev;
-       par = info->par;
-
-       crtc_count = 0;
-       /*
-        * For each CRTC, set up the connector list for the CRTC's mode
-        * set configuration.
-        */
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-
-               modeset = &intel_crtc->mode_set;
-               modeset->fb = &intel_fb->base;
-               conn_count = 0;
-               list_for_each_entry(connector, &dev->mode_config.connector_list,
-                                   head) {
-                       if (!connector->encoder)
-                               continue;
-
-                       if(connector->encoder->crtc == modeset->crtc) {
-                               modeset->connectors[conn_count++] = connector;
-                               if (conn_count > INTELFB_CONN_LIMIT)
-                                       BUG();
-                       }
-               }
-
-               /* Zero out remaining connector pointers */
-               for (i = conn_count; i < INTELFB_CONN_LIMIT; i++)
-                       modeset->connectors[i] = NULL;
-
-               par->crtc_ids[crtc_count++] = crtc->base.id;
-
-               modeset->num_connectors = conn_count;
-               if (modeset->crtc->desired_mode) {
-                       if (modeset->mode)
-                               drm_mode_destroy(dev, modeset->mode);
-                       modeset->mode = drm_mode_duplicate(dev,
-                                                          modeset->crtc->desired_mode);
-               }
-       }
-       par->crtc_count = crtc_count;
-
-       if (new_fb) {
-               info->var.pixclock = -1;
-               if (register_framebuffer(info) < 0)
-                       return -EINVAL;
-       } else
-               intelfb_set_par(info);
-
-       DRM_INFO("fb%d: %s frame buffer device\n", info->node,
-              info->fix.id);
-
-       /* Switch back to kernel console on panic */
-       kernelfb_mode = *modeset;
-       atomic_notifier_chain_register(&panic_notifier_list, &paniced);
-       DRM_DEBUG("registered panic notifier\n");
-
-       return 0;
-}
-
-/**
- * intelfb_restore - restore the framebuffer console (kernel) config
- *
- * Restore's the kernel's fbcon mode, used for lastclose & panic paths.
- */
-void intelfb_restore(void)
-{
-       int ret;
-       if ((ret = drm_crtc_helper_set_config(&kernelfb_mode)) != 0) {
-               DRM_ERROR("Failed to restore crtc configuration: %d\n",
-                         ret);
-       }
-}
-
-static void intelfb_restore_work_fn(struct work_struct *ignored)
-{
-       intelfb_restore();
-}
-static DECLARE_WORK(intelfb_restore_work, intelfb_restore_work_fn);
-
-static void intelfb_sysrq(int dummy1, struct tty_struct *dummy3)
-{
-        schedule_work(&intelfb_restore_work);
-}
-
-static struct sysrq_key_op sysrq_intelfb_restore_op = {
-        .handler = intelfb_sysrq,
-        .help_msg = "force-fb(V)",
-        .action_msg = "Restore framebuffer console",
-};
-
 int intelfb_probe(struct drm_device *dev)
 {
        int ret;
 
        DRM_DEBUG("\n");
-
-       /* something has changed in the lower levels of hell - deal with it
-          here */
-
-       /* two modes : a) 1 fb to rule all crtcs.
-                      b) one fb per crtc.
-          two actions 1) new connected device
-                      2) device removed.
-          case a/1 : if the fb surface isn't big enough - resize the surface fb.
-                     if the fb size isn't big enough - resize fb into surface.
-                     if everything big enough configure the new crtc/etc.
-          case a/2 : undo the configuration
-                     possibly resize down the fb to fit the new configuration.
-           case b/1 : see if it is on a new crtc - setup a new fb and add it.
-          case b/2 : teardown the new fb.
-       */
-
-       /* mode a first */
-       /* search for an fb */
-       if (i915_fbpercrtc == 1) {
-               ret = intelfb_multi_fb_probe(dev);
-       } else {
-               ret = intelfb_single_fb_probe(dev);
-       }
-
-       register_sysrq_key('v', &sysrq_intelfb_restore_op);
-
+       ret = drm_fb_helper_single_fb_probe(dev, intelfb_create);
        return ret;
 }
 EXPORT_SYMBOL(intelfb_probe);
@@ -940,13 +258,14 @@ int intelfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
        info = fb->fbdev;
 
        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);
        }
 
-       atomic_notifier_chain_unregister(&panic_notifier_list, &paniced);
-       memset(&kernelfb_mode, 0, sizeof(struct drm_mode_set));
        return 0;
 }
 EXPORT_SYMBOL(intelfb_remove);
index a8fa1bb..af03560 100644 (file)
@@ -158,9 +158,6 @@ static void radeon_crtc_destroy(struct drm_crtc *crtc)
 {
        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
 
-       if (radeon_crtc->mode_set.mode) {
-               drm_mode_destroy(crtc->dev, radeon_crtc->mode_set.mode);
-       }
        drm_crtc_cleanup(crtc);
        kfree(radeon_crtc);
 }
@@ -189,9 +186,11 @@ static void radeon_crtc_init(struct drm_device *dev, int index)
        radeon_crtc->crtc_id = index;
        rdev->mode_info.crtcs[index] = radeon_crtc;
 
+#if 0
        radeon_crtc->mode_set.crtc = &radeon_crtc->base;
        radeon_crtc->mode_set.connectors = (struct drm_connector **)(radeon_crtc + 1);
        radeon_crtc->mode_set.num_connectors = 0;
+#endif
 
        for (i = 0; i < 256; i++) {
                radeon_crtc->lut_r[i] = i << 2;
index ec383ed..ebb5895 100644 (file)
      */
 
 #include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
 #include <linux/fb.h>
-#include <linux/init.h>
 
 #include "drmP.h"
 #include "drm.h"
 #include "radeon_drm.h"
 #include "radeon.h"
 
+#include "drm_fb_helper.h"
+
 struct radeon_fb_device {
-       struct radeon_device            *rdev;
-       struct drm_display_mode         *mode;
+       struct drm_fb_helper helper;
        struct radeon_framebuffer       *rfb;
-       int                             crtc_count;
-       /* crtc currently bound to this */
-       uint32_t                        crtc_ids[2];
+       struct radeon_device            *rdev;
 };
 
-static int radeonfb_setcolreg(unsigned regno,
-                             unsigned red,
-                             unsigned green,
-                             unsigned blue,
-                             unsigned transp,
-                             struct fb_info *info)
-{
-       struct radeon_fb_device *rfbdev = info->par;
-       struct drm_device *dev = rfbdev->rdev->ddev;
-       struct drm_crtc *crtc;
-       int i;
-
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
-               struct drm_mode_set *modeset = &radeon_crtc->mode_set;
-               struct drm_framebuffer *fb = modeset->fb;
-
-               for (i = 0; i < rfbdev->crtc_count; i++) {
-                       if (crtc->base.id == rfbdev->crtc_ids[i]) {
-                               break;
-                       }
-               }
-               if (i == rfbdev->crtc_count) {
-                       continue;
-               }
-               if (regno > 255) {
-                       return 1;
-               }
-               if (fb->depth == 8) {
-                       radeon_crtc_fb_gamma_set(crtc, red, green, blue, regno);
-                       return 0;
-               }
-
-               if (regno < 16) {
-                       switch (fb->depth) {
-                       case 15:
-                               fb->pseudo_palette[regno] = ((red & 0xf800) >> 1) |
-                                       ((green & 0xf800) >>  6) |
-                                       ((blue & 0xf800) >> 11);
-                               break;
-                       case 16:
-                               fb->pseudo_palette[regno] = (red & 0xf800) |
-                                       ((green & 0xfc00) >>  5) |
-                                       ((blue  & 0xf800) >> 11);
-                               break;
-                       case 24:
-                       case 32:
-                               fb->pseudo_palette[regno] =
-                                       (((red >> 8) & 0xff) << info->var.red.offset) |
-                                       (((green >> 8) & 0xff) << info->var.green.offset) |
-                                       (((blue >> 8) & 0xff) << info->var.blue.offset);
-                               break;
-                       }
-               }
-       }
-       return 0;
-}
-
-static int radeonfb_check_var(struct fb_var_screeninfo *var,
-                             struct fb_info *info)
+static int radeon_fb_check_var(struct fb_var_screeninfo *var,
+                              struct fb_info *info)
 {
-       struct radeon_fb_device *rfbdev = info->par;
-       struct radeon_framebuffer *rfb = rfbdev->rfb;
-       struct drm_framebuffer *fb = &rfb->base;
-       int depth;
-
-       if (var->pixclock == -1 || !var->pixclock) {
-               return -EINVAL;
-       }
-       /* Need to resize the fb object !!! */
-       if (var->xres > fb->width || var->yres > fb->height) {
-               DRM_ERROR("Requested width/height is greater than current fb "
-                          "object %dx%d > %dx%d\n", var->xres, var->yres,
-                          fb->width, fb->height);
-               DRM_ERROR("Need resizing code.\n");
-               return -EINVAL;
-       }
-
-       switch (var->bits_per_pixel) {
-       case 16:
-               depth = (var->green.length == 6) ? 16 : 15;
-               break;
-       case 32:
-               depth = (var->transp.length > 0) ? 32 : 24;
-               break;
-       default:
-               depth = var->bits_per_pixel;
-               break;
-       }
-
-       switch (depth) {
-       case 8:
-               var->red.offset = 0;
-               var->green.offset = 0;
-               var->blue.offset = 0;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-#ifdef __LITTLE_ENDIAN
-       case 15:
-               var->red.offset = 10;
-               var->green.offset = 5;
-               var->blue.offset = 0;
-               var->red.length = 5;
-               var->green.length = 5;
-               var->blue.length = 5;
-               var->transp.length = 1;
-               var->transp.offset = 15;
-               break;
-       case 16:
-               var->red.offset = 11;
-               var->green.offset = 5;
-               var->blue.offset = 0;
-               var->red.length = 5;
-               var->green.length = 6;
-               var->blue.length = 5;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-       case 24:
-               var->red.offset = 16;
-               var->green.offset = 8;
-               var->blue.offset = 0;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-       case 32:
-               var->red.offset = 16;
-               var->green.offset = 8;
-               var->blue.offset = 0;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 8;
-               var->transp.offset = 24;
-               break;
-#else
-       case 24:
-               var->red.offset = 8;
-               var->green.offset = 16;
-               var->blue.offset = 24;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 0;
-               var->transp.offset = 0;
-               break;
-       case 32:
-               var->red.offset = 8;
-               var->green.offset = 16;
-               var->blue.offset = 24;
-               var->red.length = 8;
-               var->green.length = 8;
-               var->blue.length = 8;
-               var->transp.length = 8;
-               var->transp.offset = 0;
-               break;
-#endif
-       default:
-               return -EINVAL;
-       }
-       return 0;
-}
-
-/* this will let fbcon do the mode init */
-static int radeonfb_set_par(struct fb_info *info)
-{
-       struct radeon_fb_device *rfbdev = info->par;
-       struct drm_device *dev = rfbdev->rdev->ddev;
-       struct fb_var_screeninfo *var = &info->var;
-       struct drm_crtc *crtc;
        int ret;
-       int i;
-
-       if (var->pixclock != -1) {
-               DRM_ERROR("PIXEL CLCOK SET\n");
-               return -EINVAL;
-       }
-
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
-
-               for (i = 0; i < rfbdev->crtc_count; i++) {
-                       if (crtc->base.id == rfbdev->crtc_ids[i]) {
-                               break;
-                       }
-               }
-               if (i == rfbdev->crtc_count) {
-                       continue;
-               }
-               if (crtc->fb == radeon_crtc->mode_set.fb) {
-                       mutex_lock(&dev->mode_config.mutex);
-                       ret = crtc->funcs->set_config(&radeon_crtc->mode_set);
-                       mutex_unlock(&dev->mode_config.mutex);
-                       if (ret) {
-                               return ret;
-                       }
-               }
-       }
-       return 0;
-}
-
-static int radeonfb_pan_display(struct fb_var_screeninfo *var,
-                               struct fb_info *info)
-{
-       struct radeon_fb_device *rfbdev = info->par;
-       struct drm_device *dev = rfbdev->rdev->ddev;
-       struct drm_mode_set *modeset;
-       struct drm_crtc *crtc;
-       struct radeon_crtc *radeon_crtc;
-       int ret = 0;
-       int i;
-
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               for (i = 0; i < rfbdev->crtc_count; i++) {
-                       if (crtc->base.id == rfbdev->crtc_ids[i]) {
-                               break;
-                       }
-               }
-
-               if (i == rfbdev->crtc_count) {
-                       continue;
-               }
-
-               radeon_crtc = to_radeon_crtc(crtc);
-               modeset = &radeon_crtc->mode_set;
-
-               modeset->x = var->xoffset;
-               modeset->y = var->yoffset;
-
-               if (modeset->num_connectors) {
-                       mutex_lock(&dev->mode_config.mutex);
-                       ret = crtc->funcs->set_config(modeset);
-                       mutex_unlock(&dev->mode_config.mutex);
-                       if (!ret) {
-                               info->var.xoffset = var->xoffset;
-                               info->var.yoffset = var->yoffset;
-                       }
+       ret = drm_fb_helper_check_var(var, info);
+       if (ret)
+               return ret;
+
+       /* big endian override for radeon endian workaround */
+#ifdef __BIG_ENDIAN
+       {
+               int depth;
+               switch (var->bits_per_pixel) {
+               case 16:
+                       depth = (var->green.length == 6) ? 16 : 15;
+                       break;
+               case 32:
+                       depth = (var->transp.length > 0) ? 32 : 24;
+                       break;
+               default:
+                       depth = var->bits_per_pixel;
+                       break;
                }
-       }
-       return ret;
-}
-
-static void radeonfb_on(struct fb_info *info)
-{
-       struct radeon_fb_device *rfbdev = info->par;
-       struct drm_device *dev = rfbdev->rdev->ddev;
-       struct drm_crtc *crtc;
-       struct drm_encoder *encoder;
-       int i;
-
-       /*
-        * For each CRTC in this fb, find all associated encoders
-        * and turn them off, then turn off the CRTC.
-        */
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-
-               for (i = 0; i < rfbdev->crtc_count; i++) {
-                       if (crtc->base.id == rfbdev->crtc_ids[i]) {
-                               break;
-                       }
-               }
-
-               mutex_lock(&dev->mode_config.mutex);
-               crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-               mutex_unlock(&dev->mode_config.mutex);
-
-               /* Found a CRTC on this fb, now find encoders */
-               list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                       if (encoder->crtc == crtc) {
-                               struct drm_encoder_helper_funcs *encoder_funcs;
-
-                               encoder_funcs = encoder->helper_private;
-                               mutex_lock(&dev->mode_config.mutex);
-                               encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
-                               mutex_unlock(&dev->mode_config.mutex);
-                       }
-               }
-       }
-}
-
-static void radeonfb_off(struct fb_info *info, int dpms_mode)
-{
-       struct radeon_fb_device *rfbdev = info->par;
-       struct drm_device *dev = rfbdev->rdev->ddev;
-       struct drm_crtc *crtc;
-       struct drm_encoder *encoder;
-       int i;
-
-       /*
-        * For each CRTC in this fb, find all associated encoders
-        * and turn them off, then turn off the CRTC.
-        */
-       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-               struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-
-               for (i = 0; i < rfbdev->crtc_count; i++) {
-                       if (crtc->base.id == rfbdev->crtc_ids[i]) {
-                               break;
-                       }
-               }
-
-               /* Found a CRTC on this fb, now find encoders */
-               list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                       if (encoder->crtc == crtc) {
-                               struct drm_encoder_helper_funcs *encoder_funcs;
-
-                               encoder_funcs = encoder->helper_private;
-                               mutex_lock(&dev->mode_config.mutex);
-                               encoder_funcs->dpms(encoder, dpms_mode);
-                               mutex_unlock(&dev->mode_config.mutex);
-                       }
-               }
-               if (dpms_mode == DRM_MODE_DPMS_OFF) {
-                       mutex_lock(&dev->mode_config.mutex);
-                       crtc_funcs->dpms(crtc, dpms_mode);
-                       mutex_unlock(&dev->mode_config.mutex);
+               switch (depth) {
+               case 8:
+                       var->red.offset = 0;
+                       var->green.offset = 0;
+                       var->blue.offset = 0;
+                       var->red.length = 8;
+                       var->green.length = 8;
+                       var->blue.length = 8;
+                       var->transp.length = 0;
+                       var->transp.offset = 0;
+                       break;
+               case 24:
+                       var->red.offset = 8;
+                       var->green.offset = 16;
+                       var->blue.offset = 24;
+                       var->red.length = 8;
+                       var->green.length = 8;
+                       var->blue.length = 8;
+                       var->transp.length = 0;
+                       var->transp.offset = 0;
+                       break;
+               case 32:
+                       var->red.offset = 8;
+                       var->green.offset = 16;
+                       var->blue.offset = 24;
+                       var->red.length = 8;
+                       var->green.length = 8;
+                       var->blue.length = 8;
+                       var->transp.length = 8;
+                       var->transp.offset = 0;
+                       break;
+               default:
+                       return -EINVAL;
                }
        }
-}
-
-int radeonfb_blank(int blank, struct fb_info *info)
-{
-       switch (blank) {
-       case FB_BLANK_UNBLANK:
-               radeonfb_on(info);
-               break;
-       case FB_BLANK_NORMAL:
-               radeonfb_off(info, DRM_MODE_DPMS_STANDBY);
-               break;
-       case FB_BLANK_HSYNC_SUSPEND:
-               radeonfb_off(info, DRM_MODE_DPMS_STANDBY);
-               break;
-       case FB_BLANK_VSYNC_SUSPEND:
-               radeonfb_off(info, DRM_MODE_DPMS_SUSPEND);
-               break;
-       case FB_BLANK_POWERDOWN:
-               radeonfb_off(info, DRM_MODE_DPMS_OFF);
-               break;
-       }
+#endif
        return 0;
 }
 
 static struct fb_ops radeonfb_ops = {
        .owner = THIS_MODULE,
-       .fb_check_var = radeonfb_check_var,
-       .fb_set_par = radeonfb_set_par,
-       .fb_setcolreg = radeonfb_setcolreg,
+       .fb_check_var = radeon_fb_check_var,
+       .fb_set_par = drm_fb_helper_set_par,
+       .fb_setcolreg = drm_fb_helper_setcolreg,
        .fb_fillrect = cfb_fillrect,
        .fb_copyarea = cfb_copyarea,
        .fb_imageblit = cfb_imageblit,
-       .fb_pan_display = radeonfb_pan_display,
-       .fb_blank = radeonfb_blank,
+       .fb_pan_display = drm_fb_helper_pan_display,
+       .fb_blank = drm_fb_helper_blank,
 };
 
 /**
@@ -456,21 +159,6 @@ int radeonfb_resize(struct drm_device *dev, struct drm_crtc *crtc)
 }
 EXPORT_SYMBOL(radeonfb_resize);
 
-static struct drm_mode_set panic_mode;
-
-int radeonfb_panic(struct notifier_block *n, unsigned long ununsed,
-                 void *panic_str)
-{
-       DRM_ERROR("panic occurred, switching back to text console\n");
-       drm_crtc_helper_set_config(&panic_mode);
-       return 0;
-}
-EXPORT_SYMBOL(radeonfb_panic);
-
-static struct notifier_block paniced = {
-       .notifier_call = radeonfb_panic,
-};
-
 static int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bool tiled)
 {
        int aligned = width;
@@ -495,11 +183,16 @@ static int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bo
        return aligned;
 }
 
-int radeonfb_create(struct radeon_device *rdev,
+static struct drm_fb_helper_funcs radeon_fb_helper_funcs = {
+       .gamma_set = radeon_crtc_fb_gamma_set,
+};
+
+int radeonfb_create(struct drm_device *dev,
                    uint32_t fb_width, uint32_t fb_height,
                    uint32_t surface_width, uint32_t surface_height,
-                   struct radeon_framebuffer **rfb_p)
+                   struct drm_framebuffer **fb_p)
 {
+       struct radeon_device *rdev = dev->dev_private;
        struct fb_info *info;
        struct radeon_fb_device *rfbdev;
        struct drm_framebuffer *fb = NULL;
@@ -554,8 +247,8 @@ int radeonfb_create(struct radeon_device *rdev,
 
        list_add(&fb->filp_head, &rdev->ddev->mode_config.fb_kernel_list);
 
+       *fb_p = fb;
        rfb = to_radeon_framebuffer(fb);
-       *rfb_p = rfb;
        rdev->fbdev_rfb = rfb;
        rdev->fbdev_robj = robj;
 
@@ -564,7 +257,14 @@ int radeonfb_create(struct radeon_device *rdev,
                ret = -ENOMEM;
                goto out_unref;
        }
+
        rfbdev = info->par;
+       rfbdev->helper.funcs = &radeon_fb_helper_funcs;
+       rfbdev->helper.dev = dev;
+       ret = drm_fb_helper_init_crtc_count(&rfbdev->helper, 2,
+                                           RADEONFB_CONN_LIMIT);
+       if (ret)
+               goto out_unref;
 
        if (fb_tiled)
                radeon_object_check_tiling(robj, 0, 0);
@@ -577,33 +277,19 @@ int radeonfb_create(struct radeon_device *rdev,
        memset_io(fbptr, 0, aligned_size);
 
        strcpy(info->fix.id, "radeondrmfb");
-       info->fix.type = FB_TYPE_PACKED_PIXELS;
-       info->fix.visual = FB_VISUAL_TRUECOLOR;
-       info->fix.type_aux = 0;
-       info->fix.xpanstep = 1; /* doing it in hw */
-       info->fix.ypanstep = 1; /* doing it in hw */
-       info->fix.ywrapstep = 0;
-       info->fix.accel = FB_ACCEL_NONE;
-       info->fix.type_aux = 0;
+
+       drm_fb_helper_fill_fix(info, fb->pitch);
+
        info->flags = FBINFO_DEFAULT;
        info->fbops = &radeonfb_ops;
-       info->fix.line_length = fb->pitch;
+
        tmp = fb_gpuaddr - rdev->mc.vram_location;
        info->fix.smem_start = rdev->mc.aper_base + tmp;
        info->fix.smem_len = size;
        info->screen_base = fbptr;
        info->screen_size = size;
-       info->pseudo_palette = fb->pseudo_palette;
-       info->var.xres_virtual = fb->width;
-       info->var.yres_virtual = fb->height;
-       info->var.bits_per_pixel = fb->bits_per_pixel;
-       info->var.xoffset = 0;
-       info->var.yoffset = 0;
-       info->var.activate = FB_ACTIVATE_NOW;
-       info->var.height = -1;
-       info->var.width = -1;
-       info->var.xres = fb_width;
-       info->var.yres = fb_height;
+
+       drm_fb_helper_fill_var(info, fb, fb_width, fb_height);
 
        /* setup aperture base/size for vesafb takeover */
        info->aperture_base = rdev->ddev->mode_config.fb_base;
@@ -626,6 +312,9 @@ int radeonfb_create(struct radeon_device *rdev,
        DRM_INFO("fb depth is %d\n", fb->depth);
        DRM_INFO("   pitch is %d\n", fb->pitch);
 
+#ifdef __BIG_ENDIAN
+       /* fill var sets defaults for this stuff - override
+          on big endian */
        switch (fb->depth) {
        case 8:
                info->var.red.offset = 0;
@@ -637,47 +326,6 @@ int radeonfb_create(struct radeon_device *rdev,
                info->var.transp.offset = 0;
                info->var.transp.length = 0;
                break;
-#ifdef __LITTLE_ENDIAN
-       case 15:
-               info->var.red.offset = 10;
-               info->var.green.offset = 5;
-               info->var.blue.offset = 0;
-               info->var.red.length = 5;
-               info->var.green.length = 5;
-               info->var.blue.length = 5;
-               info->var.transp.offset = 15;
-               info->var.transp.length = 1;
-               break;
-       case 16:
-               info->var.red.offset = 11;
-               info->var.green.offset = 5;
-               info->var.blue.offset = 0;
-               info->var.red.length = 5;
-               info->var.green.length = 6;
-               info->var.blue.length = 5;
-               info->var.transp.offset = 0;
-               break;
-       case 24:
-               info->var.red.offset = 16;
-               info->var.green.offset = 8;
-               info->var.blue.offset = 0;
-               info->var.red.length = 8;
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 0;
-               info->var.transp.length = 0;
-               break;
-       case 32:
-               info->var.red.offset = 16;
-               info->var.green.offset = 8;
-               info->var.blue.offset = 0;
-               info->var.red.length = 8;
-               info->var.green.length = 8;
-               info->var.blue.length = 8;
-               info->var.transp.offset = 24;
-               info->var.transp.length = 8;
-               break;
-#else
        case 24:
                info->var.red.offset = 8;
                info->var.green.offset = 16;
@@ -699,9 +347,9 @@ int radeonfb_create(struct radeon_device *rdev,
                info->var.transp.length = 8;
                break;
        default:
-#endif
                break;
        }
+#endif
 
        fb->fbdev = info;
        rfbdev->rfb = rfb;
@@ -726,145 +374,10 @@ out:
        return ret;
 }
 
-static int radeonfb_single_fb_probe(struct radeon_device *rdev)
-{
-       struct drm_crtc *crtc;
-       struct drm_connector *connector;
-       unsigned int fb_width = (unsigned)-1, fb_height = (unsigned)-1;
-       unsigned int surface_width = 0, surface_height = 0;
-       int new_fb = 0;
-       int crtc_count = 0;
-       int ret, i, conn_count = 0;
-       struct radeon_framebuffer *rfb;
-       struct fb_info *info;
-       struct radeon_fb_device *rfbdev;
-       struct drm_mode_set *modeset = NULL;
-
-       /* first up get a count of crtcs now in use and new min/maxes width/heights */
-       list_for_each_entry(crtc, &rdev->ddev->mode_config.crtc_list, head) {
-               if (drm_helper_crtc_in_use(crtc)) {
-                       if (crtc->desired_mode) {
-                               if (crtc->desired_mode->hdisplay < fb_width)
-                                       fb_width = crtc->desired_mode->hdisplay;
-
-                               if (crtc->desired_mode->vdisplay < fb_height)
-                                       fb_height = crtc->desired_mode->vdisplay;
-
-                               if (crtc->desired_mode->hdisplay > surface_width)
-                                       surface_width = crtc->desired_mode->hdisplay;
-
-                               if (crtc->desired_mode->vdisplay > surface_height)
-                                       surface_height = crtc->desired_mode->vdisplay;
-                       }
-                       crtc_count++;
-               }
-       }
-
-       if (crtc_count == 0 || fb_width == -1 || fb_height == -1) {
-               /* hmm everyone went away - assume VGA cable just fell out
-                  and will come back later. */
-               return 0;
-       }
-
-       /* do we have an fb already? */
-       if (list_empty(&rdev->ddev->mode_config.fb_kernel_list)) {
-               /* create an fb if we don't have one */
-               ret = radeonfb_create(rdev, fb_width, fb_height, surface_width, surface_height, &rfb);
-               if (ret) {
-                       return -EINVAL;
-               }
-               new_fb = 1;
-       } else {
-               struct drm_framebuffer *fb;
-               fb = list_first_entry(&rdev->ddev->mode_config.fb_kernel_list, struct drm_framebuffer, filp_head);
-               rfb = to_radeon_framebuffer(fb);
-
-               /* if someone hotplugs something bigger than we have already allocated, we are pwned.
-                  As really we can't resize an fbdev that is in the wild currently due to fbdev
-                  not really being designed for the lower layers moving stuff around under it.
-                  - so in the grand style of things - punt. */
-               if ((fb->width < surface_width) || (fb->height < surface_height)) {
-                       DRM_ERROR("Framebuffer not large enough to scale console onto.\n");
-                       return -EINVAL;
-               }
-       }
-
-       info = rfb->base.fbdev;
-       rdev->fbdev_info = info;
-       rfbdev = info->par;
-
-       crtc_count = 0;
-       /* okay we need to setup new connector sets in the crtcs */
-       list_for_each_entry(crtc, &rdev->ddev->mode_config.crtc_list, head) {
-               struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
-               modeset = &radeon_crtc->mode_set;
-               modeset->fb = &rfb->base;
-               conn_count = 0;
-               list_for_each_entry(connector, &rdev->ddev->mode_config.connector_list, head) {
-                       if (connector->encoder)
-                               if (connector->encoder->crtc == modeset->crtc) {
-                                       modeset->connectors[conn_count] = connector;
-                                       conn_count++;
-                                       if (conn_count > RADEONFB_CONN_LIMIT)
-                                               BUG();
-                               }
-               }
-
-               for (i = conn_count; i < RADEONFB_CONN_LIMIT; i++)
-                       modeset->connectors[i] = NULL;
-
-
-               rfbdev->crtc_ids[crtc_count++] = crtc->base.id;
-
-               modeset->num_connectors = conn_count;
-               if (modeset->crtc->desired_mode) {
-                       if (modeset->mode) {
-                               drm_mode_destroy(rdev->ddev, modeset->mode);
-                       }
-                       modeset->mode = drm_mode_duplicate(rdev->ddev,
-                                                          modeset->crtc->desired_mode);
-               }
-       }
-       rfbdev->crtc_count = crtc_count;
-
-       if (new_fb) {
-               info->var.pixclock = -1;
-               if (register_framebuffer(info) < 0)
-                       return -EINVAL;
-       } else {
-               radeonfb_set_par(info);
-       }
-       printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node,
-              info->fix.id);
-
-       /* Switch back to kernel console on panic */
-       panic_mode = *modeset;
-       atomic_notifier_chain_register(&panic_notifier_list, &paniced);
-       printk(KERN_INFO "registered panic notifier\n");
-
-       return 0;
-}
-
 int radeonfb_probe(struct drm_device *dev)
 {
        int ret;
-
-       /* something has changed in the lower levels of hell - deal with it
-          here */
-
-       /* two modes : a) 1 fb to rule all crtcs.
-                      b) one fb per crtc.
-          two actions 1) new connected device
-                      2) device removed.
-          case a/1 : if the fb surface isn't big enough - resize the surface fb.
-                     if the fb size isn't big enough - resize fb into surface.
-                     if everything big enough configure the new crtc/etc.
-          case a/2 : undo the configuration
-                     possibly resize down the fb to fit the new configuration.
-           case b/1 : see if it is on a new crtc - setup a new fb and add it.
-          case b/2 : teardown the new fb.
-       */
-       ret = radeonfb_single_fb_probe(dev->dev_private);
+       ret = drm_fb_helper_single_fb_probe(dev, &radeonfb_create);
        return ret;
 }
 EXPORT_SYMBOL(radeonfb_probe);
@@ -880,16 +393,17 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
        }
        info = fb->fbdev;
        if (info) {
+               struct radeon_fb_device *rfbdev = info->par;
                robj = rfb->obj->driver_private;
                unregister_framebuffer(info);
                radeon_object_kunmap(robj);
                radeon_object_unpin(robj);
+               drm_fb_helper_free(&rfbdev->helper);
                framebuffer_release(info);
        }
 
        printk(KERN_INFO "unregistered panic notifier\n");
-       atomic_notifier_chain_unregister(&panic_notifier_list, &paniced);
-       memset(&panic_mode, 0, sizeof(struct drm_mode_set));
+
        return 0;
 }
 EXPORT_SYMBOL(radeonfb_remove);
index 3b09a1f..20e9509 100644 (file)
@@ -195,8 +195,6 @@ struct radeon_crtc {
        bool enabled;
        bool can_tile;
        uint32_t crtc_offset;
-       struct radeon_framebuffer *fbdev_fb;
-       struct drm_mode_set mode_set;
        struct drm_gem_object *cursor_bo;
        uint64_t cursor_addr;
        int cursor_width;
index db92a83..b0427a7 100644 (file)
@@ -259,6 +259,8 @@ struct drm_framebuffer {
        void *fbdev;
        u32 pseudo_palette[17];
        struct list_head filp_head;
+       /* if you are using the helper */
+       void *helper_private;
 };
 
 struct drm_property_blob {
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
new file mode 100644 (file)
index 0000000..88fffbd
--- /dev/null
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2006-2009 Red Hat Inc.
+ * Copyright (c) 2006-2008 Intel Corporation
+ * Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
+ *
+ * DRM framebuffer helper functions
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Authors:
+ *      Dave Airlie <airlied@linux.ie>
+ *      Jesse Barnes <jesse.barnes@intel.com>
+ */
+#ifndef DRM_FB_HELPER_H
+#define DRM_FB_HELPER_H
+
+struct drm_fb_helper_crtc {
+       uint32_t crtc_id;
+       struct drm_mode_set mode_set;
+};
+
+struct drm_fb_helper_funcs {
+       void (*gamma_set)(struct drm_crtc *crtc, u16 red, u16 green,
+                         u16 blue, int regno);
+};
+
+struct drm_fb_helper {
+       struct drm_framebuffer *fb;
+       struct drm_device *dev;
+       struct drm_display_mode *mode;
+       int crtc_count;
+       struct drm_fb_helper_crtc *crtc_info;
+       struct drm_fb_helper_funcs *funcs;
+       int conn_limit;
+       struct list_head kernel_fb_list;
+};
+
+int drm_fb_helper_single_fb_probe(struct drm_device *dev,
+                                 int (*fb_create)(struct drm_device *dev,
+                                                  uint32_t fb_width,
+                                                  uint32_t fb_height,
+                                                  uint32_t surface_width,
+                                                  uint32_t surface_height,
+                                                  struct drm_framebuffer **fb_ptr));
+int drm_fb_helper_init_crtc_count(struct drm_fb_helper *helper, int crtc_count,
+                                 int max_conn);
+void drm_fb_helper_free(struct drm_fb_helper *helper);
+int drm_fb_helper_blank(int blank, struct fb_info *info);
+int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
+                             struct fb_info *info);
+int drm_fb_helper_set_par(struct fb_info *info);
+int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
+                           struct fb_info *info);
+int drm_fb_helper_setcolreg(unsigned regno,
+                           unsigned red,
+                           unsigned green,
+                           unsigned blue,
+                           unsigned transp,
+                           struct fb_info *info);
+
+void drm_fb_helper_restore(void);
+void drm_fb_helper_fill_var(struct fb_info *info, struct drm_framebuffer *fb,
+                           uint32_t fb_width, uint32_t fb_height);
+void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch);
+
+#endif