adb_probe_task: remove unneeded flush_signals() call
[safe/jmp/linux-2.6] / drivers / macintosh / via-pmu-backlight.c
index b42d05f..7e27071 100644 (file)
 
 #define MAX_PMU_LEVEL 0xFF
 
-static struct device_node *vias;
-static struct backlight_properties pmu_backlight_data;
+static struct backlight_ops pmu_backlight_data;
+static DEFINE_SPINLOCK(pmu_backlight_lock);
+static int sleeping;
+static u8 bl_curve[FB_BACKLIGHT_LEVELS];
 
-static int pmu_backlight_get_level_brightness(struct fb_info *info,
-               int level)
+static void pmu_backlight_init_curve(u8 off, u8 min, u8 max)
+{
+       unsigned int i, flat, count, range = (max - min);
+
+       bl_curve[0] = off;
+
+       for (flat = 1; flat < (FB_BACKLIGHT_LEVELS / 16); ++flat)
+               bl_curve[flat] = min;
+
+       count = FB_BACKLIGHT_LEVELS * 15 / 16;
+       for (i = 0; i < count; ++i)
+               bl_curve[flat + i] = min + (range * (i + 1) / count);
+}
+
+static int pmu_backlight_curve_lookup(int value)
+{
+       int level = (FB_BACKLIGHT_LEVELS - 1);
+       int i, max = 0;
+
+       /* Look for biggest value */
+       for (i = 0; i < FB_BACKLIGHT_LEVELS; i++)
+               max = max((int)bl_curve[i], max);
+
+       /* Look for nearest value */
+       for (i = 0; i < FB_BACKLIGHT_LEVELS; i++) {
+               int diff = abs(bl_curve[i] - value);
+               if (diff < max) {
+                       max = diff;
+                       level = i;
+               }
+       }
+       return level;
+}
+
+static int pmu_backlight_get_level_brightness(int level)
 {
        int pmulevel;
 
        /* Get and convert the value */
-       mutex_lock(&info->bl_mutex);
-       pmulevel = info->bl_curve[level] * FB_BACKLIGHT_MAX / MAX_PMU_LEVEL;
-       mutex_unlock(&info->bl_mutex);
-
+       pmulevel = bl_curve[level] * FB_BACKLIGHT_MAX / MAX_PMU_LEVEL;
        if (pmulevel < 0)
                pmulevel = 0;
        else if (pmulevel > MAX_PMU_LEVEL)
@@ -38,50 +70,69 @@ static int pmu_backlight_get_level_brightness(struct fb_info *info,
 
 static int pmu_backlight_update_status(struct backlight_device *bd)
 {
-       struct fb_info *info = class_get_devdata(&bd->class_dev);
        struct adb_request req;
-       int pmulevel, level = bd->props->brightness;
+       unsigned long flags;
+       int level = bd->props.brightness;
 
-       if (vias == NULL)
-               return -ENODEV;
+       spin_lock_irqsave(&pmu_backlight_lock, flags);
 
-       if (bd->props->power != FB_BLANK_UNBLANK ||
-           bd->props->fb_blank != FB_BLANK_UNBLANK)
+       /* Don't update brightness when sleeping */
+       if (sleeping)
+               goto out;
+
+       if (bd->props.power != FB_BLANK_UNBLANK ||
+           bd->props.fb_blank != FB_BLANK_UNBLANK)
                level = 0;
 
-       pmulevel = pmu_backlight_get_level_brightness(info, level);
+       if (level > 0) {
+               int pmulevel = pmu_backlight_get_level_brightness(level);
+
+               pmu_request(&req, NULL, 2, PMU_BACKLIGHT_BRIGHT, pmulevel);
+               pmu_wait_complete(&req);
 
-       pmu_request(&req, NULL, 2, PMU_BACKLIGHT_BRIGHT, pmulevel);
-       pmu_wait_complete(&req);
+               pmu_request(&req, NULL, 2, PMU_POWER_CTRL,
+                       PMU_POW_BACKLIGHT | PMU_POW_ON);
+               pmu_wait_complete(&req);
+       } else {
+               pmu_request(&req, NULL, 2, PMU_POWER_CTRL,
+                       PMU_POW_BACKLIGHT | PMU_POW_OFF);
+               pmu_wait_complete(&req);
+       }
 
-       pmu_request(&req, NULL, 2, PMU_POWER_CTRL,
-               PMU_POW_BACKLIGHT | (level > 0 ? PMU_POW_ON : PMU_POW_OFF));
-       pmu_wait_complete(&req);
+out:
+       spin_unlock_irqrestore(&pmu_backlight_lock, flags);
 
        return 0;
 }
 
 static int pmu_backlight_get_brightness(struct backlight_device *bd)
 {
-       return bd->props->brightness;
+       return bd->props.brightness;
 }
 
-static struct backlight_properties pmu_backlight_data = {
-       .owner          = THIS_MODULE,
+static struct backlight_ops pmu_backlight_data = {
        .get_brightness = pmu_backlight_get_brightness,
        .update_status  = pmu_backlight_update_status,
-       .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
+
 };
 
-void __init pmu_backlight_init(struct device_node *in_vias)
+#ifdef CONFIG_PM
+void pmu_backlight_set_sleep(int sleep)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&pmu_backlight_lock, flags);
+       sleeping = sleep;
+       spin_unlock_irqrestore(&pmu_backlight_lock, flags);
+}
+#endif /* CONFIG_PM */
+
+void __init pmu_backlight_init()
 {
        struct backlight_device *bd;
-       struct fb_info *info;
        char name[10];
        int level, autosave;
 
-       vias = in_vias;
-
        /* Special case for the old PowerBook since I can't test on it */
        autosave =
                machine_is_compatible("AAPL,3400/2400") ||
@@ -93,29 +144,17 @@ void __init pmu_backlight_init(struct device_node *in_vias)
            !machine_is_compatible("PowerBook1,1"))
                return;
 
-       /* Actually, this is a hack, but I don't know of a better way
-        * to get the first framebuffer device.
-        */
-       info = registered_fb[0];
-       if (!info) {
-               printk("pmubl: No framebuffer found\n");
-               goto error;
-       }
+       snprintf(name, sizeof(name), "pmubl");
 
-       snprintf(name, sizeof(name), "pmubl%d", info->node);
-
-       bd = backlight_device_register(name, info, &pmu_backlight_data);
+       bd = backlight_device_register(name, NULL, NULL, &pmu_backlight_data);
        if (IS_ERR(bd)) {
                printk("pmubl: Backlight registration failed\n");
                goto error;
        }
+       bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
+       pmu_backlight_init_curve(0x7F, 0x46, 0x0E);
 
-       mutex_lock(&info->bl_mutex);
-       info->bl_dev = bd;
-       fb_bl_default_curve(info, 0x7F, 0x46, 0x0E);
-       mutex_unlock(&info->bl_mutex);
-
-       level = pmu_backlight_data.max_brightness;
+       level = bd->props.max_brightness;
 
        if (autosave) {
                /* read autosaved value if available */
@@ -123,23 +162,14 @@ void __init pmu_backlight_init(struct device_node *in_vias)
                pmu_request(&req, NULL, 2, 0xd9, 0);
                pmu_wait_complete(&req);
 
-               mutex_lock(&info->bl_mutex);
-               level = pmac_backlight_curve_lookup(info,
+               level = pmu_backlight_curve_lookup(
                                (req.reply[0] >> 4) *
-                               pmu_backlight_data.max_brightness / 15);
-               mutex_unlock(&info->bl_mutex);
+                               bd->props.max_brightness / 15);
        }
 
-       up(&bd->sem);
-       bd->props->brightness = level;
-       bd->props->power = FB_BLANK_UNBLANK;
-       bd->props->update_status(bd);
-       down(&bd->sem);
-
-       mutex_lock(&pmac_backlight_mutex);
-       if (!pmac_backlight)
-               pmac_backlight = bd;
-       mutex_unlock(&pmac_backlight_mutex);
+       bd->props.brightness = level;
+       bd->props.power = FB_BLANK_UNBLANK;
+       backlight_update_status(bd);
 
        printk("pmubl: Backlight initialized (%s)\n", name);