[PATCH] Rewritten backlight infrastructure for portable Apple computers

This patch contains a total rewrite of the backlight infrastructure for
portable Apple computers.  Backward compatibility is retained.  A sysfs
interface allows userland to control the brightness with more steps than
before.  Userland is allowed to upload a brightness curve for different
monitors, similar to Mac OS X.

[akpm@osdl.org: add needed exports]
Signed-off-by: Michael Hanselmann <linux-kernel@hansmi.ch>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

7 files changed, 637 insertions, 261 deletions

diff --git a/drivers/video/aty/Makefile b/drivers/video/aty/Makefile
index 18521397a6e3..a6cc0e9ec790 100644
--- a/drivers/video/aty/Makefile
+++ b/drivers/video/aty/Makefile
@@ -10,5 +10,6 @@ atyfb-objs			:= $(atyfb-y)
 
 radeonfb-y                      := radeon_base.o radeon_pm.o radeon_monitor.o radeon_accel.o
 radeonfb-$(CONFIG_FB_RADEON_I2C)        += radeon_i2c.o
+radeonfb-$(CONFIG_FB_RADEON_BACKLIGHT)  += radeon_backlight.o
 radeonfb-objs                   := $(radeonfb-y)
 
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index f7bbff4ddc6a..db878fd55fb2 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -64,6 +64,7 @@
 #include <linux/pci.h>
 #include <linux/ioport.h>
 #include <linux/console.h>
+#include <linux/backlight.h>
 #include <asm/io.h>
 
 #ifdef CONFIG_PPC_PMAC
@@ -480,16 +481,6 @@ static struct fb_ops aty128fb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-static int aty128_set_backlight_enable(int on, int level, void* data);
-static int aty128_set_backlight_level(int level, void* data);
-
-static struct backlight_controller aty128_backlight_controller = {
-        aty128_set_backlight_enable,
-        aty128_set_backlight_level
-};
-#endif /* CONFIG_PMAC_BACKLIGHT */
-
     /*
      * Functions to read from/write to the mmio registers
      *  - endian conversions may possibly be avoided by
@@ -1258,19 +1249,35 @@ static void aty128_set_crt_enable(struct aty128fb_par *par, int on)
 static void aty128_set_lcd_enable(struct aty128fb_par *par, int on)
 {
         u32 reg;
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+#endif
 
         if (on) {
                 reg = aty_ld_le32(LVDS_GEN_CNTL);
                 reg |= LVDS_ON | LVDS_EN | LVDS_BLON | LVDS_DIGION;
                 reg &= ~LVDS_DISPLAY_DIS;
                 aty_st_le32(LVDS_GEN_CNTL, reg);
-#ifdef CONFIG_PMAC_BACKLIGHT
-                aty128_set_backlight_enable(get_backlight_enable(),
-                                            get_backlight_level(), par);
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+                mutex_lock(&info->bl_mutex);
+                if (info->bl_dev) {
+                        down(&info->bl_dev->sem);
+                        info->bl_dev->props->update_status(info->bl_dev);
+                        up(&info->bl_dev->sem);
+                }
+                mutex_unlock(&info->bl_mutex);
 #endif  
         } else {
-#ifdef CONFIG_PMAC_BACKLIGHT
-                aty128_set_backlight_enable(0, 0, par);
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+                mutex_lock(&info->bl_mutex);
+                if (info->bl_dev) {
+                        down(&info->bl_dev->sem);
+                        info->bl_dev->props->brightness = 0;
+                        info->bl_dev->props->power = FB_BLANK_POWERDOWN;
+                        info->bl_dev->props->update_status(info->bl_dev);
+                        up(&info->bl_dev->sem);
+                }
+                mutex_unlock(&info->bl_mutex);
 #endif  
                 reg = aty_ld_le32(LVDS_GEN_CNTL);
                 reg |= LVDS_DISPLAY_DIS;
@@ -1691,6 +1698,184 @@ static int __init aty128fb_setup(char *options)
 }
 #endif  /*  MODULE  */
 
+/* Backlight */
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+#define MAX_LEVEL 0xFF
+
+static struct backlight_properties aty128_bl_data;
+
+static int aty128_bl_get_level_brightness(struct aty128fb_par *par,
+                int level)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        int atylevel;
+
+        /* Get and convert the value */
+        mutex_lock(&info->bl_mutex);
+        atylevel = MAX_LEVEL -
+                (info->bl_curve[level] * FB_BACKLIGHT_MAX / MAX_LEVEL);
+        mutex_unlock(&info->bl_mutex);
+
+        if (atylevel < 0)
+                atylevel = 0;
+        else if (atylevel > MAX_LEVEL)
+                atylevel = MAX_LEVEL;
+
+        return atylevel;
+}
+
+/* We turn off the LCD completely instead of just dimming the backlight.
+ * This provides greater power saving and the display is useless without
+ * backlight anyway
+ */
+#define BACKLIGHT_LVDS_OFF
+/* That one prevents proper CRT output with LCD off */
+#undef BACKLIGHT_DAC_OFF
+
+static int aty128_bl_update_status(struct backlight_device *bd)
+{
+        struct aty128fb_par *par = class_get_devdata(&bd->class_dev);
+        unsigned int reg = aty_ld_le32(LVDS_GEN_CNTL);
+        int level;
+
+        if (bd->props->power != FB_BLANK_UNBLANK ||
+            bd->props->fb_blank != FB_BLANK_UNBLANK ||
+            !par->lcd_on)
+                level = 0;
+        else
+                level = bd->props->brightness;
+
+        reg |= LVDS_BL_MOD_EN | LVDS_BLON;
+        if (level > 0) {
+                reg |= LVDS_DIGION;
+                if (!(reg & LVDS_ON)) {
+                        reg &= ~LVDS_BLON;
+                        aty_st_le32(LVDS_GEN_CNTL, reg);
+                        aty_ld_le32(LVDS_GEN_CNTL);
+                        mdelay(10);
+                        reg |= LVDS_BLON;
+                        aty_st_le32(LVDS_GEN_CNTL, reg);
+                }
+                reg &= ~LVDS_BL_MOD_LEVEL_MASK;
+                reg |= (aty128_bl_get_level_brightness(par, level) << LVDS_BL_MOD_LEVEL_SHIFT);
+#ifdef BACKLIGHT_LVDS_OFF
+                reg |= LVDS_ON | LVDS_EN;
+                reg &= ~LVDS_DISPLAY_DIS;
+#endif
+                aty_st_le32(LVDS_GEN_CNTL, reg);
+#ifdef BACKLIGHT_DAC_OFF
+                aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) & (~DAC_PDWN));
+#endif
+        } else {
+                reg &= ~LVDS_BL_MOD_LEVEL_MASK;
+                reg |= (aty128_bl_get_level_brightness(par, 0) << LVDS_BL_MOD_LEVEL_SHIFT);
+#ifdef BACKLIGHT_LVDS_OFF
+                reg |= LVDS_DISPLAY_DIS;
+                aty_st_le32(LVDS_GEN_CNTL, reg);
+                aty_ld_le32(LVDS_GEN_CNTL);
+                udelay(10);
+                reg &= ~(LVDS_ON | LVDS_EN | LVDS_BLON | LVDS_DIGION);
+#endif
+                aty_st_le32(LVDS_GEN_CNTL, reg);
+#ifdef BACKLIGHT_DAC_OFF
+                aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) | DAC_PDWN);
+#endif
+        }
+
+        return 0;
+}
+
+static int aty128_bl_get_brightness(struct backlight_device *bd)
+{
+        return bd->props->brightness;
+}
+
+static struct backlight_properties aty128_bl_data = {
+        .owner          = THIS_MODULE,
+        .get_brightness = aty128_bl_get_brightness,
+        .update_status  = aty128_bl_update_status,
+        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
+};
+
+static void aty128_bl_init(struct aty128fb_par *par)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        struct backlight_device *bd;
+        char name[12];
+
+        /* Could be extended to Rage128Pro LVDS output too */
+        if (par->chip_gen != rage_M3)
+                return;
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        if (!pmac_has_backlight_type("ati"))
+                return;
+#endif
+
+        snprintf(name, sizeof(name), "aty128bl%d", info->node);
+
+        bd = backlight_device_register(name, par, &aty128_bl_data);
+        if (IS_ERR(bd)) {
+                info->bl_dev = NULL;
+                printk("aty128: Backlight registration failed\n");
+                goto error;
+        }
+
+        mutex_lock(&info->bl_mutex);
+        info->bl_dev = bd;
+        fb_bl_default_curve(info, 0,
+                 63 * FB_BACKLIGHT_MAX / MAX_LEVEL,
+                219 * FB_BACKLIGHT_MAX / MAX_LEVEL);
+        mutex_unlock(&info->bl_mutex);
+
+        up(&bd->sem);
+        bd->props->brightness = aty128_bl_data.max_brightness;
+        bd->props->power = FB_BLANK_UNBLANK;
+        bd->props->update_status(bd);
+        down(&bd->sem);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+        if (!pmac_backlight)
+                pmac_backlight = bd;
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+
+        printk("aty128: Backlight initialized (%s)\n", name);
+
+        return;
+
+error:
+        return;
+}
+
+static void aty128_bl_exit(struct aty128fb_par *par)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+#endif
+
+        mutex_lock(&info->bl_mutex);
+        if (info->bl_dev) {
+#ifdef CONFIG_PMAC_BACKLIGHT
+                if (pmac_backlight == info->bl_dev)
+                        pmac_backlight = NULL;
+#endif
+
+                backlight_device_unregister(info->bl_dev);
+                info->bl_dev = NULL;
+
+                printk("aty128: Backlight unloaded\n");
+        }
+        mutex_unlock(&info->bl_mutex);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+}
+#endif /* CONFIG_FB_ATY128_BACKLIGHT */
 
 /*
  *  Initialisation
@@ -1835,17 +2020,15 @@ static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id *
         if (register_framebuffer(info) < 0)
                 return 0;
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-        /* Could be extended to Rage128Pro LVDS output too */
-        if (par->chip_gen == rage_M3)
-                register_backlight_controller(&aty128_backlight_controller, par, "ati");
-#endif /* CONFIG_PMAC_BACKLIGHT */
-
         par->pm_reg = pci_find_capability(pdev, PCI_CAP_ID_PM);
         par->pdev = pdev;
         par->asleep = 0;
         par->lock_blank = 0;
-        
+
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+        aty128_bl_init(par);
+#endif
+
         printk(KERN_INFO "fb%d: %s frame buffer device on %s\n",
                info->node, info->fix.id, video_card);
 
@@ -1981,6 +2164,10 @@ static void __devexit aty128_remove(struct pci_dev *pdev)
 
         par = info->par;
 
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+        aty128_bl_exit(par);
+#endif
+
         unregister_framebuffer(info);
 #ifdef CONFIG_MTRR
         if (par->mtrr.vram_valid)
@@ -2011,10 +2198,14 @@ static int aty128fb_blank(int blank, struct fb_info *fb)
         if (par->lock_blank || par->asleep)
                 return 0;
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-        if (machine_is(powermac) && blank)
-                set_backlight_enable(0);
-#endif /* CONFIG_PMAC_BACKLIGHT */
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+        if (machine_is(powermac) && blank) {
+                down(&fb->bl_dev->sem);
+                fb->bl_dev->props->power = FB_BLANK_POWERDOWN;
+                fb->bl_dev->props->update_status(fb->bl_dev);
+                up(&fb->bl_dev->sem);
+        }
+#endif
 
         if (blank & FB_BLANK_VSYNC_SUSPEND)
                 state |= 2;
@@ -2029,10 +2220,14 @@ static int aty128fb_blank(int blank, struct fb_info *fb)
                 aty128_set_crt_enable(par, par->crt_on && !blank);
                 aty128_set_lcd_enable(par, par->lcd_on && !blank);
         }
-#ifdef CONFIG_PMAC_BACKLIGHT
-        if (machine_is(powermac) && !blank)
-                set_backlight_enable(1);
-#endif /* CONFIG_PMAC_BACKLIGHT */
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+        if (machine_is(powermac) && !blank) {
+                down(&fb->bl_dev->sem);
+                fb->bl_dev->props->power = FB_BLANK_UNBLANK;
+                fb->bl_dev->props->update_status(fb->bl_dev);
+                up(&fb->bl_dev->sem);
+        }
+#endif
         return 0;
 }
 
@@ -2138,73 +2333,6 @@ static int aty128fb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
         return -EINVAL;
 }
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-static int backlight_conv[] = {
-        0xff, 0xc0, 0xb5, 0xaa, 0x9f, 0x94, 0x89, 0x7e,
-        0x73, 0x68, 0x5d, 0x52, 0x47, 0x3c, 0x31, 0x24
-};
-
-/* We turn off the LCD completely instead of just dimming the backlight.
- * This provides greater power saving and the display is useless without
- * backlight anyway
- */
-#define BACKLIGHT_LVDS_OFF
-/* That one prevents proper CRT output with LCD off */
-#undef BACKLIGHT_DAC_OFF
-
-static int aty128_set_backlight_enable(int on, int level, void *data)
-{
-        struct aty128fb_par *par = data;
-        unsigned int reg = aty_ld_le32(LVDS_GEN_CNTL);
-
-        if (!par->lcd_on)
-                on = 0;
-        reg |= LVDS_BL_MOD_EN | LVDS_BLON;
-        if (on && level > BACKLIGHT_OFF) {
-                reg |= LVDS_DIGION;
-                if (!(reg & LVDS_ON)) {
-                        reg &= ~LVDS_BLON;
-                        aty_st_le32(LVDS_GEN_CNTL, reg);
-                        (void)aty_ld_le32(LVDS_GEN_CNTL);
-                        mdelay(10);
-                        reg |= LVDS_BLON;
-                        aty_st_le32(LVDS_GEN_CNTL, reg);
-                }
-                reg &= ~LVDS_BL_MOD_LEVEL_MASK;
-                reg |= (backlight_conv[level] << LVDS_BL_MOD_LEVEL_SHIFT);
-#ifdef BACKLIGHT_LVDS_OFF
-                reg |= LVDS_ON | LVDS_EN;
-                reg &= ~LVDS_DISPLAY_DIS;
-#endif
-                aty_st_le32(LVDS_GEN_CNTL, reg);
-#ifdef BACKLIGHT_DAC_OFF
-                aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) & (~DAC_PDWN));
-#endif          
-        } else {
-                reg &= ~LVDS_BL_MOD_LEVEL_MASK;
-                reg |= (backlight_conv[0] << LVDS_BL_MOD_LEVEL_SHIFT);
-#ifdef BACKLIGHT_LVDS_OFF
-                reg |= LVDS_DISPLAY_DIS;
-                aty_st_le32(LVDS_GEN_CNTL, reg);
-                (void)aty_ld_le32(LVDS_GEN_CNTL);
-                udelay(10);
-                reg &= ~(LVDS_ON | LVDS_EN | LVDS_BLON | LVDS_DIGION);
-#endif          
-                aty_st_le32(LVDS_GEN_CNTL, reg);
-#ifdef BACKLIGHT_DAC_OFF
-                aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) | DAC_PDWN);
-#endif          
-        }
-
-        return 0;
-}
-
-static int aty128_set_backlight_level(int level, void* data)
-{
-        return aty128_set_backlight_enable(1, level, data);
-}
-#endif /* CONFIG_PMAC_BACKLIGHT */
-
 #if 0
     /*
      *  Accelerated functions
diff --git a/drivers/video/aty/atyfb.h b/drivers/video/aty/atyfb.h
index e9b7a64c1ac4..43d2cb58af87 100644
--- a/drivers/video/aty/atyfb.h
+++ b/drivers/video/aty/atyfb.h
@@ -151,6 +151,7 @@ struct atyfb_par {
         int lock_blank;
         unsigned long res_start;
         unsigned long res_size;
+        struct pci_dev *pdev;
 #ifdef __sparc__
         struct pci_mmap_map *mmap_map;
         u8 mmaped;
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index c054bb28b1c4..c5185f7cf4ba 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -66,6 +66,7 @@
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
+#include <linux/backlight.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -2115,45 +2116,142 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
 
 #endif /*  defined(CONFIG_PM) && defined(CONFIG_PCI) */
 
-#ifdef CONFIG_PMAC_BACKLIGHT
+/* Backlight */
+#ifdef CONFIG_FB_ATY_BACKLIGHT
+#define MAX_LEVEL 0xFF
 
-    /*
-     *   LCD backlight control
-     */
+static struct backlight_properties aty_bl_data;
 
-static int backlight_conv[] = {
-        0x00, 0x3f, 0x4c, 0x59, 0x66, 0x73, 0x80, 0x8d,
-        0x9a, 0xa7, 0xb4, 0xc1, 0xcf, 0xdc, 0xe9, 0xff
-};
+static int aty_bl_get_level_brightness(struct atyfb_par *par, int level)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        int atylevel;
+
+        /* Get and convert the value */
+        mutex_lock(&info->bl_mutex);
+        atylevel = info->bl_curve[level] * FB_BACKLIGHT_MAX / MAX_LEVEL;
+        mutex_unlock(&info->bl_mutex);
+
+        if (atylevel < 0)
+                atylevel = 0;
+        else if (atylevel > MAX_LEVEL)
+                atylevel = MAX_LEVEL;
 
-static int aty_set_backlight_enable(int on, int level, void *data)
+        return atylevel;
+}
+
+static int aty_bl_update_status(struct backlight_device *bd)
 {
-        struct fb_info *info = (struct fb_info *) data;
-        struct atyfb_par *par = (struct atyfb_par *) info->par;
+        struct atyfb_par *par = class_get_devdata(&bd->class_dev);
         unsigned int reg = aty_ld_lcd(LCD_MISC_CNTL, par);
+        int level;
+
+        if (bd->props->power != FB_BLANK_UNBLANK ||
+            bd->props->fb_blank != FB_BLANK_UNBLANK)
+                level = 0;
+        else
+                level = bd->props->brightness;
 
         reg |= (BLMOD_EN | BIASMOD_EN);
-        if (on && level > BACKLIGHT_OFF) {
+        if (level > 0) {
                 reg &= ~BIAS_MOD_LEVEL_MASK;
-                reg |= (backlight_conv[level] << BIAS_MOD_LEVEL_SHIFT);
+                reg |= (aty_bl_get_level_brightness(par, level) << BIAS_MOD_LEVEL_SHIFT);
         } else {
                 reg &= ~BIAS_MOD_LEVEL_MASK;
-                reg |= (backlight_conv[0] << BIAS_MOD_LEVEL_SHIFT);
+                reg |= (aty_bl_get_level_brightness(par, 0) << BIAS_MOD_LEVEL_SHIFT);
         }
         aty_st_lcd(LCD_MISC_CNTL, reg, par);
+
         return 0;
 }
 
-static int aty_set_backlight_level(int level, void *data)
+static int aty_bl_get_brightness(struct backlight_device *bd)
 {
-        return aty_set_backlight_enable(1, level, data);
+        return bd->props->brightness;
 }
 
-static struct backlight_controller aty_backlight_controller = {
-        aty_set_backlight_enable,
-        aty_set_backlight_level
+static struct backlight_properties aty_bl_data = {
+        .owner    = THIS_MODULE,
+        .get_brightness = aty_bl_get_brightness,
+        .update_status  = aty_bl_update_status,
+        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
 };
-#endif /* CONFIG_PMAC_BACKLIGHT */
+
+static void aty_bl_init(struct atyfb_par *par)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        struct backlight_device *bd;
+        char name[12];
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        if (!pmac_has_backlight_type("ati"))
+                return;
+#endif
+
+        snprintf(name, sizeof(name), "atybl%d", info->node);
+
+        bd = backlight_device_register(name, par, &aty_bl_data);
+        if (IS_ERR(bd)) {
+                info->bl_dev = NULL;
+                printk("aty: Backlight registration failed\n");
+                goto error;
+        }
+
+        mutex_lock(&info->bl_mutex);
+        info->bl_dev = bd;
+        fb_bl_default_curve(info, 0,
+                0x3F * FB_BACKLIGHT_MAX / MAX_LEVEL,
+                0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL);
+        mutex_unlock(&info->bl_mutex);
+
+        up(&bd->sem);
+        bd->props->brightness = aty_bl_data.max_brightness;
+        bd->props->power = FB_BLANK_UNBLANK;
+        bd->props->update_status(bd);
+        down(&bd->sem);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+        if (!pmac_backlight)
+                pmac_backlight = bd;
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+
+        printk("aty: Backlight initialized (%s)\n", name);
+
+        return;
+
+error:
+        return;
+}
+
+static void aty_bl_exit(struct atyfb_par *par)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+#endif
+
+        mutex_lock(&info->bl_mutex);
+        if (info->bl_dev) {
+#ifdef CONFIG_PMAC_BACKLIGHT
+                if (pmac_backlight == info->bl_dev)
+                        pmac_backlight = NULL;
+#endif
+
+                backlight_device_unregister(info->bl_dev);
+
+                printk("aty: Backlight unloaded\n");
+        }
+        mutex_unlock(&info->bl_mutex);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+}
+
+#endif /* CONFIG_FB_ATY_BACKLIGHT */
 
 static void __init aty_calc_mem_refresh(struct atyfb_par *par, int xclk)
 {
@@ -2513,9 +2611,13 @@ static int __init aty_init(struct fb_info *info, const char *name)
                 /* these bits let the 101 powerbook wake up from sleep -- paulus */
                 aty_st_lcd(POWER_MANAGEMENT, aty_ld_lcd(POWER_MANAGEMENT, par)
                            | (USE_F32KHZ | TRISTATE_MEM_EN), par);
-        } else if (M64_HAS(MOBIL_BUS))
-                register_backlight_controller(&aty_backlight_controller, info, "ati");
-#endif /* CONFIG_PMAC_BACKLIGHT */
+        } else
+#endif
+        if (M64_HAS(MOBIL_BUS)) {
+#ifdef CONFIG_FB_ATY_BACKLIGHT
+                aty_bl_init (par);
+#endif
+        }
 
         memset(&var, 0, sizeof(var));
 #ifdef CONFIG_PPC
@@ -2674,8 +2776,16 @@ static int atyfb_blank(int blank, struct fb_info *info)
                 return 0;
 
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if (machine_is(powermac) && blank > FB_BLANK_NORMAL)
-                set_backlight_enable(0);
+        if (machine_is(powermac) && blank > FB_BLANK_NORMAL) {
+                mutex_lock(&info->bl_mutex);
+                if (info->bl_dev) {
+                        down(&info->bl_dev->sem);
+                        info->bl_dev->props->power = FB_BLANK_POWERDOWN;
+                        info->bl_dev->props->update_status(info->bl_dev);
+                        up(&info->bl_dev->sem);
+                }
+                mutex_unlock(&info->bl_mutex);
+        }
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
         if (par->lcd_table && blank > FB_BLANK_NORMAL &&
             (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
@@ -2706,8 +2816,16 @@ static int atyfb_blank(int blank, struct fb_info *info)
         aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
 
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if (machine_is(powermac) && blank <= FB_BLANK_NORMAL)
-                set_backlight_enable(1);
+        if (machine_is(powermac) && blank <= FB_BLANK_NORMAL) {
+                mutex_lock(&info->bl_mutex);
+                if (info->bl_dev) {
+                        down(&info->bl_dev->sem);
+                        info->bl_dev->props->power = FB_BLANK_UNBLANK;
+                        info->bl_dev->props->update_status(info->bl_dev);
+                        up(&info->bl_dev->sem);
+                }
+                mutex_unlock(&info->bl_mutex);
+        }
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
         if (par->lcd_table && blank <= FB_BLANK_NORMAL &&
             (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
@@ -3440,6 +3558,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
         par->res_start = res_start;
         par->res_size = res_size;
         par->irq = pdev->irq;
+        par->pdev = pdev;
 
         /* Setup "info" structure */
 #ifdef __sparc__
@@ -3571,6 +3690,11 @@ static void __devexit atyfb_remove(struct fb_info *info)
         aty_set_crtc(par, &saved_crtc);
         par->pll_ops->set_pll(info, &saved_pll);
 
+#ifdef CONFIG_FB_ATY_BACKLIGHT
+        if (M64_HAS(MOBIL_BUS))
+                aty_bl_exit(par);
+#endif
+
         unregister_framebuffer(info);
 
 #ifdef CONFIG_MTRR
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
new file mode 100644
index 000000000000..7de66b855d4e
--- /dev/null
+++ b/drivers/video/aty/radeon_backlight.c
@@ -0,0 +1,247 @@
+/*
+ * Backlight code for ATI Radeon based graphic cards
+ *
+ * Copyright (c) 2000 Ani Joshi <ajoshi@kernel.crashing.org>
+ * Copyright (c) 2003 Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ * Copyright (c) 2006 Michael Hanselmann <linux-kernel@hansmi.ch>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "radeonfb.h"
+#include <linux/backlight.h>
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+#include <asm/backlight.h>
+#endif
+
+#define MAX_RADEON_LEVEL 0xFF
+
+static struct backlight_properties radeon_bl_data;
+
+struct radeon_bl_privdata {
+        struct radeonfb_info *rinfo;
+        uint8_t negative;
+};
+
+static int radeon_bl_get_level_brightness(struct radeon_bl_privdata *pdata,
+                int level)
+{
+        struct fb_info *info = pdata->rinfo->info;
+        int rlevel;
+
+        mutex_lock(&info->bl_mutex);
+
+        /* Get and convert the value */
+        rlevel = pdata->rinfo->info->bl_curve[level] *
+                 FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL;
+
+        mutex_unlock(&info->bl_mutex);
+
+        if (pdata->negative)
+                rlevel = MAX_RADEON_LEVEL - rlevel;
+
+        if (rlevel < 0)
+                rlevel = 0;
+        else if (rlevel > MAX_RADEON_LEVEL)
+                rlevel = MAX_RADEON_LEVEL;
+
+        return rlevel;
+}
+
+static int radeon_bl_update_status(struct backlight_device *bd)
+{
+        struct radeon_bl_privdata *pdata = class_get_devdata(&bd->class_dev);
+        struct radeonfb_info *rinfo = pdata->rinfo;
+        u32 lvds_gen_cntl, tmpPixclksCntl;
+        int level;
+
+        if (rinfo->mon1_type != MT_LCD)
+                return 0;
+
+        /* We turn off the LCD completely instead of just dimming the
+         * backlight. This provides some greater power saving and the display
+         * is useless without backlight anyway.
+         */
+        if (bd->props->power != FB_BLANK_UNBLANK ||
+            bd->props->fb_blank != FB_BLANK_UNBLANK)
+                level = 0;
+        else
+                level = bd->props->brightness;
+
+        del_timer_sync(&rinfo->lvds_timer);
+        radeon_engine_idle();
+
+        lvds_gen_cntl = INREG(LVDS_GEN_CNTL);
+        if (level > 0) {
+                lvds_gen_cntl &= ~LVDS_DISPLAY_DIS;
+                if (!(lvds_gen_cntl & LVDS_BLON) || !(lvds_gen_cntl & LVDS_ON)) {
+                        lvds_gen_cntl |= (rinfo->init_state.lvds_gen_cntl & LVDS_DIGON);
+                        lvds_gen_cntl |= LVDS_BLON | LVDS_EN;
+                        OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
+                        lvds_gen_cntl &= ~LVDS_BL_MOD_LEVEL_MASK;
+                        lvds_gen_cntl |=
+                                (radeon_bl_get_level_brightness(pdata, level) <<
+                                 LVDS_BL_MOD_LEVEL_SHIFT);
+                        lvds_gen_cntl |= LVDS_ON;
+                        lvds_gen_cntl |= (rinfo->init_state.lvds_gen_cntl & LVDS_BL_MOD_EN);
+                        rinfo->pending_lvds_gen_cntl = lvds_gen_cntl;
+                        mod_timer(&rinfo->lvds_timer,
+                                  jiffies + msecs_to_jiffies(rinfo->panel_info.pwr_delay));
+                } else {
+                        lvds_gen_cntl &= ~LVDS_BL_MOD_LEVEL_MASK;
+                        lvds_gen_cntl |=
+                                (radeon_bl_get_level_brightness(pdata, level) <<
+                                 LVDS_BL_MOD_LEVEL_SHIFT);
+                        OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
+                }
+                rinfo->init_state.lvds_gen_cntl &= ~LVDS_STATE_MASK;
+                rinfo->init_state.lvds_gen_cntl |= rinfo->pending_lvds_gen_cntl
+                        & LVDS_STATE_MASK;
+        } else {
+                /* Asic bug, when turning off LVDS_ON, we have to make sure
+                   RADEON_PIXCLK_LVDS_ALWAYS_ON bit is off
+                */
+                tmpPixclksCntl = INPLL(PIXCLKS_CNTL);
+                if (rinfo->is_mobility || rinfo->is_IGP)
+                        OUTPLLP(PIXCLKS_CNTL, 0, ~PIXCLK_LVDS_ALWAYS_ONb);
+                lvds_gen_cntl &= ~(LVDS_BL_MOD_LEVEL_MASK | LVDS_BL_MOD_EN);
+                lvds_gen_cntl |= (radeon_bl_get_level_brightness(pdata, 0) <<
+                                  LVDS_BL_MOD_LEVEL_SHIFT);
+                lvds_gen_cntl |= LVDS_DISPLAY_DIS;
+                OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
+                udelay(100);
+                lvds_gen_cntl &= ~(LVDS_ON | LVDS_EN);
+                OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
+                lvds_gen_cntl &= ~(LVDS_DIGON);
+                rinfo->pending_lvds_gen_cntl = lvds_gen_cntl;
+                mod_timer(&rinfo->lvds_timer,
+                          jiffies + msecs_to_jiffies(rinfo->panel_info.pwr_delay));
+                if (rinfo->is_mobility || rinfo->is_IGP)
+                        OUTPLL(PIXCLKS_CNTL, tmpPixclksCntl);
+        }
+        rinfo->init_state.lvds_gen_cntl &= ~LVDS_STATE_MASK;
+        rinfo->init_state.lvds_gen_cntl |= (lvds_gen_cntl & LVDS_STATE_MASK);
+
+        return 0;
+}
+
+static int radeon_bl_get_brightness(struct backlight_device *bd)
+{
+        return bd->props->brightness;
+}
+
+static struct backlight_properties radeon_bl_data = {
+        .owner          = THIS_MODULE,
+        .get_brightness = radeon_bl_get_brightness,
+        .update_status  = radeon_bl_update_status,
+        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
+};
+
+void radeonfb_bl_init(struct radeonfb_info *rinfo)
+{
+        struct backlight_device *bd;
+        struct radeon_bl_privdata *pdata;
+        char name[12];
+
+        if (rinfo->mon1_type != MT_LCD)
+                return;
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        if (!pmac_has_backlight_type("ati") &&
+            !pmac_has_backlight_type("mnca"))
+                return;
+#endif
+
+        pdata = kmalloc(sizeof(struct radeon_bl_privdata), GFP_KERNEL);
+        if (!pdata) {
+                printk("radeonfb: Memory allocation failed\n");
+                goto error;
+        }
+
+        snprintf(name, sizeof(name), "radeonbl%d", rinfo->info->node);
+
+        bd = backlight_device_register(name, pdata, &radeon_bl_data);
+        if (IS_ERR(bd)) {
+                rinfo->info->bl_dev = NULL;
+                printk("radeonfb: Backlight registration failed\n");
+                goto error;
+        }
+
+        pdata->rinfo = rinfo;
+
+        /* Pardon me for that hack... maybe some day we can figure out in what
+         * direction backlight should work on a given panel?
+         */
+        pdata->negative =
+                (rinfo->family != CHIP_FAMILY_RV200 &&
+                 rinfo->family != CHIP_FAMILY_RV250 &&
+                 rinfo->family != CHIP_FAMILY_RV280 &&
+                 rinfo->family != CHIP_FAMILY_RV350);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        pdata->negative = pdata->negative ||
+                machine_is_compatible("PowerBook4,3") ||
+                machine_is_compatible("PowerBook6,3") ||
+                machine_is_compatible("PowerBook6,5");
+#endif
+
+        mutex_lock(&rinfo->info->bl_mutex);
+        rinfo->info->bl_dev = bd;
+        fb_bl_default_curve(rinfo->info, 0,
+                 63 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL,
+                217 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL);
+        mutex_unlock(&rinfo->info->bl_mutex);
+
+        up(&bd->sem);
+        bd->props->brightness = radeon_bl_data.max_brightness;
+        bd->props->power = FB_BLANK_UNBLANK;
+        bd->props->update_status(bd);
+        down(&bd->sem);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+        if (!pmac_backlight)
+                pmac_backlight = bd;
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+
+        printk("radeonfb: Backlight initialized (%s)\n", name);
+
+        return;
+
+error:
+        kfree(pdata);
+        return;
+}
+
+void radeonfb_bl_exit(struct radeonfb_info *rinfo)
+{
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+#endif
+
+        mutex_lock(&rinfo->info->bl_mutex);
+        if (rinfo->info->bl_dev) {
+                struct radeon_bl_privdata *pdata;
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+                if (pmac_backlight == rinfo->info->bl_dev)
+                        pmac_backlight = NULL;
+#endif
+
+                pdata = class_get_devdata(&rinfo->info->bl_dev->class_dev);
+                backlight_device_unregister(rinfo->info->bl_dev);
+                kfree(pdata);
+                rinfo->info->bl_dev = NULL;
+
+                printk("radeonfb: Backlight unloaded\n");
+        }
+        mutex_unlock(&rinfo->info->bl_mutex);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+}
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 387a18a47ac2..c5ecbb02e01d 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -78,10 +78,6 @@
 #include <asm/pci-bridge.h>
 #include "../macmodes.h"
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-#include <asm/backlight.h>
-#endif
-
 #ifdef CONFIG_BOOTX_TEXT
 #include <asm/btext.h>
 #endif
@@ -277,20 +273,6 @@ static int nomtrr = 0;
  * prototypes
  */
 
-
-#ifdef CONFIG_PPC_OF
-
-#ifdef CONFIG_PMAC_BACKLIGHT
-static int radeon_set_backlight_enable(int on, int level, void *data);
-static int radeon_set_backlight_level(int level, void *data);
-static struct backlight_controller radeon_backlight_controller = {
-        radeon_set_backlight_enable,
-        radeon_set_backlight_level
-};
-#endif /* CONFIG_PMAC_BACKLIGHT */
-
-#endif /* CONFIG_PPC_OF */
-
 static void radeon_unmap_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev)
 {
         if (!rinfo->bios_seg)
@@ -1913,116 +1895,6 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo)
         return 0;
 }
 
-
-#ifdef CONFIG_PMAC_BACKLIGHT
-
-/* TODO: Dbl check these tables, we don't go up to full ON backlight
- * in these, possibly because we noticed MacOS doesn't, but I'd prefer
- * having some more official numbers from ATI
- */
-static int backlight_conv_m6[] = {
-        0xff, 0xc0, 0xb5, 0xaa, 0x9f, 0x94, 0x89, 0x7e,
-        0x73, 0x68, 0x5d, 0x52, 0x47, 0x3c, 0x31, 0x24
-};
-static int backlight_conv_m7[] = {
-        0x00, 0x3f, 0x4a, 0x55, 0x60, 0x6b, 0x76, 0x81,
-        0x8c, 0x97, 0xa2, 0xad, 0xb8, 0xc3, 0xce, 0xd9
-};
-
-#define BACKLIGHT_LVDS_OFF
-#undef BACKLIGHT_DAC_OFF
-
-/* We turn off the LCD completely instead of just dimming the backlight.
- * This provides some greater power saving and the display is useless
- * without backlight anyway.
- */
-static int radeon_set_backlight_enable(int on, int level, void *data)
-{
-        struct radeonfb_info *rinfo = (struct radeonfb_info *)data;
-        u32 lvds_gen_cntl, tmpPixclksCntl;
-        int* conv_table;
-
-        if (rinfo->mon1_type != MT_LCD)
-                return 0;
-
-        /* Pardon me for that hack... maybe some day we can figure
-         * out in what direction backlight should work on a given
-         * panel ?
-         */
-        if ((rinfo->family == CHIP_FAMILY_RV200 ||
-             rinfo->family == CHIP_FAMILY_RV250 ||
-             rinfo->family == CHIP_FAMILY_RV280 ||
-             rinfo->family == CHIP_FAMILY_RV350) &&
-            !machine_is_compatible("PowerBook4,3") &&
-            !machine_is_compatible("PowerBook6,3") &&
-            !machine_is_compatible("PowerBook6,5"))
-                conv_table = backlight_conv_m7;
-        else
-                conv_table = backlight_conv_m6;
-
-        del_timer_sync(&rinfo->lvds_timer);
-        radeon_engine_idle();
-
-        lvds_gen_cntl = INREG(LVDS_GEN_CNTL);
-        if (on && (level > BACKLIGHT_OFF)) {
-                lvds_gen_cntl &= ~LVDS_DISPLAY_DIS;
-                if (!(lvds_gen_cntl & LVDS_BLON) || !(lvds_gen_cntl & LVDS_ON)) {
-                        lvds_gen_cntl |= (rinfo->init_state.lvds_gen_cntl & LVDS_DIGON);
-                        lvds_gen_cntl |= LVDS_BLON | LVDS_EN;
-                        OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
-                        lvds_gen_cntl &= ~LVDS_BL_MOD_LEVEL_MASK;
-                        lvds_gen_cntl |= (conv_table[level] <<
-                                          LVDS_BL_MOD_LEVEL_SHIFT);
-                        lvds_gen_cntl |= LVDS_ON;
-                        lvds_gen_cntl |= (rinfo->init_state.lvds_gen_cntl & LVDS_BL_MOD_EN);
-                        rinfo->pending_lvds_gen_cntl = lvds_gen_cntl;
-                        mod_timer(&rinfo->lvds_timer,
-                                  jiffies + msecs_to_jiffies(rinfo->panel_info.pwr_delay));
-                } else {
-                        lvds_gen_cntl &= ~LVDS_BL_MOD_LEVEL_MASK;
-                        lvds_gen_cntl |= (conv_table[level] <<
-                                          LVDS_BL_MOD_LEVEL_SHIFT);
-                        OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
-                }
-                rinfo->init_state.lvds_gen_cntl &= ~LVDS_STATE_MASK;
-                rinfo->init_state.lvds_gen_cntl |= rinfo->pending_lvds_gen_cntl
-                        & LVDS_STATE_MASK;
-        } else {
-                /* Asic bug, when turning off LVDS_ON, we have to make sure
-                   RADEON_PIXCLK_LVDS_ALWAYS_ON bit is off
-                */
-                tmpPixclksCntl = INPLL(PIXCLKS_CNTL);
-                if (rinfo->is_mobility || rinfo->is_IGP)
-                        OUTPLLP(PIXCLKS_CNTL, 0, ~PIXCLK_LVDS_ALWAYS_ONb);
-                lvds_gen_cntl &= ~(LVDS_BL_MOD_LEVEL_MASK | LVDS_BL_MOD_EN);
-                lvds_gen_cntl |= (conv_table[0] <<
-                                  LVDS_BL_MOD_LEVEL_SHIFT);
-                lvds_gen_cntl |= LVDS_DISPLAY_DIS;
-                OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
-                udelay(100);
-                lvds_gen_cntl &= ~(LVDS_ON | LVDS_EN);
-                OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
-                lvds_gen_cntl &= ~(LVDS_DIGON);
-                rinfo->pending_lvds_gen_cntl = lvds_gen_cntl;
-                mod_timer(&rinfo->lvds_timer,
-                          jiffies + msecs_to_jiffies(rinfo->panel_info.pwr_delay));
-                if (rinfo->is_mobility || rinfo->is_IGP)
-                        OUTPLL(PIXCLKS_CNTL, tmpPixclksCntl);
-        }
-        rinfo->init_state.lvds_gen_cntl &= ~LVDS_STATE_MASK;
-        rinfo->init_state.lvds_gen_cntl |= (lvds_gen_cntl & LVDS_STATE_MASK);
-
-        return 0;
-}
-
-
-static int radeon_set_backlight_level(int level, void *data)
-{
-        return radeon_set_backlight_enable(1, level, data);
-}
-#endif /* CONFIG_PMAC_BACKLIGHT */
-
-
 /*
  * This reconfigure the card's internal memory map. In theory, we'd like
  * to setup the card's memory at the same address as it's PCI bus address,
@@ -2477,14 +2349,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
                                                  MTRR_TYPE_WRCOMB, 1);
 #endif
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-        if (rinfo->mon1_type == MT_LCD) {
-                register_backlight_controller(&radeon_backlight_controller,
-                                              rinfo, "ati");
-                register_backlight_controller(&radeon_backlight_controller,
-                                              rinfo, "mnca");
-        }
-#endif
+        radeonfb_bl_init(rinfo);
 
         printk ("radeonfb (%s): %s\n", pci_name(rinfo->pdev), rinfo->name);
 
@@ -2528,7 +2393,8 @@ static void __devexit radeonfb_pci_unregister (struct pci_dev *pdev)
  
         if (!rinfo)
                 return;
- 
+
+        radeonfb_bl_exit(rinfo);
         radeonfb_pm_exit(rinfo);
 
         if (rinfo->mon1_EDID)
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 217e00ab4a2d..1645943b1123 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -625,4 +625,13 @@ extern int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_
 extern void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,
                                int reg_only);
 
+/* Backlight functions */
+#ifdef CONFIG_FB_RADEON_BACKLIGHT
+extern void radeonfb_bl_init(struct radeonfb_info *rinfo);
+extern void radeonfb_bl_exit(struct radeonfb_info *rinfo);
+#else
+static inline void radeonfb_bl_init(struct radeonfb_info *rinfo) {}
+static inline void radeonfb_bl_exit(struct radeonfb_info *rinfo) {}
+#endif
+
 #endif /* __RADEONFB_H__ */