diff options
Diffstat (limited to 'drivers/video/aty')
-rw-r--r-- | drivers/video/aty/aty128fb.c | 7 | ||||
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 7 | ||||
-rw-r--r-- | drivers/video/aty/radeon_backlight.c | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index 9ee67d6da710..a489be0c4614 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c | |||
@@ -1802,6 +1802,7 @@ static void aty128_bl_set_power(struct fb_info *info, int power) | |||
1802 | 1802 | ||
1803 | static void aty128_bl_init(struct aty128fb_par *par) | 1803 | static void aty128_bl_init(struct aty128fb_par *par) |
1804 | { | 1804 | { |
1805 | struct backlight_properties props; | ||
1805 | struct fb_info *info = pci_get_drvdata(par->pdev); | 1806 | struct fb_info *info = pci_get_drvdata(par->pdev); |
1806 | struct backlight_device *bd; | 1807 | struct backlight_device *bd; |
1807 | char name[12]; | 1808 | char name[12]; |
@@ -1817,7 +1818,10 @@ static void aty128_bl_init(struct aty128fb_par *par) | |||
1817 | 1818 | ||
1818 | snprintf(name, sizeof(name), "aty128bl%d", info->node); | 1819 | snprintf(name, sizeof(name), "aty128bl%d", info->node); |
1819 | 1820 | ||
1820 | bd = backlight_device_register(name, info->dev, par, &aty128_bl_data); | 1821 | memset(&props, 0, sizeof(struct backlight_properties)); |
1822 | props.max_brightness = FB_BACKLIGHT_LEVELS - 1; | ||
1823 | bd = backlight_device_register(name, info->dev, par, &aty128_bl_data, | ||
1824 | &props); | ||
1821 | if (IS_ERR(bd)) { | 1825 | if (IS_ERR(bd)) { |
1822 | info->bl_dev = NULL; | 1826 | info->bl_dev = NULL; |
1823 | printk(KERN_WARNING "aty128: Backlight registration failed\n"); | 1827 | printk(KERN_WARNING "aty128: Backlight registration failed\n"); |
@@ -1829,7 +1833,6 @@ static void aty128_bl_init(struct aty128fb_par *par) | |||
1829 | 63 * FB_BACKLIGHT_MAX / MAX_LEVEL, | 1833 | 63 * FB_BACKLIGHT_MAX / MAX_LEVEL, |
1830 | 219 * FB_BACKLIGHT_MAX / MAX_LEVEL); | 1834 | 219 * FB_BACKLIGHT_MAX / MAX_LEVEL); |
1831 | 1835 | ||
1832 | bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1; | ||
1833 | bd->props.brightness = bd->props.max_brightness; | 1836 | bd->props.brightness = bd->props.max_brightness; |
1834 | bd->props.power = FB_BLANK_UNBLANK; | 1837 | bd->props.power = FB_BLANK_UNBLANK; |
1835 | backlight_update_status(bd); | 1838 | backlight_update_status(bd); |
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index e45ab8db2ddc..29d72851f85b 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -2232,6 +2232,7 @@ static struct backlight_ops aty_bl_data = { | |||
2232 | 2232 | ||
2233 | static void aty_bl_init(struct atyfb_par *par) | 2233 | static void aty_bl_init(struct atyfb_par *par) |
2234 | { | 2234 | { |
2235 | struct backlight_properties props; | ||
2235 | struct fb_info *info = pci_get_drvdata(par->pdev); | 2236 | struct fb_info *info = pci_get_drvdata(par->pdev); |
2236 | struct backlight_device *bd; | 2237 | struct backlight_device *bd; |
2237 | char name[12]; | 2238 | char name[12]; |
@@ -2243,7 +2244,10 @@ static void aty_bl_init(struct atyfb_par *par) | |||
2243 | 2244 | ||
2244 | snprintf(name, sizeof(name), "atybl%d", info->node); | 2245 | snprintf(name, sizeof(name), "atybl%d", info->node); |
2245 | 2246 | ||
2246 | bd = backlight_device_register(name, info->dev, par, &aty_bl_data); | 2247 | memset(&props, 0, sizeof(struct backlight_properties)); |
2248 | props.max_brightness = FB_BACKLIGHT_LEVELS - 1; | ||
2249 | bd = backlight_device_register(name, info->dev, par, &aty_bl_data, | ||
2250 | &props); | ||
2247 | if (IS_ERR(bd)) { | 2251 | if (IS_ERR(bd)) { |
2248 | info->bl_dev = NULL; | 2252 | info->bl_dev = NULL; |
2249 | printk(KERN_WARNING "aty: Backlight registration failed\n"); | 2253 | printk(KERN_WARNING "aty: Backlight registration failed\n"); |
@@ -2255,7 +2259,6 @@ static void aty_bl_init(struct atyfb_par *par) | |||
2255 | 0x3F * FB_BACKLIGHT_MAX / MAX_LEVEL, | 2259 | 0x3F * FB_BACKLIGHT_MAX / MAX_LEVEL, |
2256 | 0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL); | 2260 | 0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL); |
2257 | 2261 | ||
2258 | bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1; | ||
2259 | bd->props.brightness = bd->props.max_brightness; | 2262 | bd->props.brightness = bd->props.max_brightness; |
2260 | bd->props.power = FB_BLANK_UNBLANK; | 2263 | bd->props.power = FB_BLANK_UNBLANK; |
2261 | backlight_update_status(bd); | 2264 | backlight_update_status(bd); |
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c index fa1198c4ccc5..9fc8c66be3ce 100644 --- a/drivers/video/aty/radeon_backlight.c +++ b/drivers/video/aty/radeon_backlight.c | |||
@@ -134,6 +134,7 @@ static struct backlight_ops radeon_bl_data = { | |||
134 | 134 | ||
135 | void radeonfb_bl_init(struct radeonfb_info *rinfo) | 135 | void radeonfb_bl_init(struct radeonfb_info *rinfo) |
136 | { | 136 | { |
137 | struct backlight_properties props; | ||
137 | struct backlight_device *bd; | 138 | struct backlight_device *bd; |
138 | struct radeon_bl_privdata *pdata; | 139 | struct radeon_bl_privdata *pdata; |
139 | char name[12]; | 140 | char name[12]; |
@@ -155,7 +156,10 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo) | |||
155 | 156 | ||
156 | snprintf(name, sizeof(name), "radeonbl%d", rinfo->info->node); | 157 | snprintf(name, sizeof(name), "radeonbl%d", rinfo->info->node); |
157 | 158 | ||
158 | bd = backlight_device_register(name, rinfo->info->dev, pdata, &radeon_bl_data); | 159 | memset(&props, 0, sizeof(struct backlight_properties)); |
160 | props.max_brightness = FB_BACKLIGHT_LEVELS - 1; | ||
161 | bd = backlight_device_register(name, rinfo->info->dev, pdata, | ||
162 | &radeon_bl_data, &props); | ||
159 | if (IS_ERR(bd)) { | 163 | if (IS_ERR(bd)) { |
160 | rinfo->info->bl_dev = NULL; | 164 | rinfo->info->bl_dev = NULL; |
161 | printk("radeonfb: Backlight registration failed\n"); | 165 | printk("radeonfb: Backlight registration failed\n"); |
@@ -185,7 +189,6 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo) | |||
185 | 63 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL, | 189 | 63 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL, |
186 | 217 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL); | 190 | 217 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL); |
187 | 191 | ||
188 | bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1; | ||
189 | bd->props.brightness = bd->props.max_brightness; | 192 | bd->props.brightness = bd->props.max_brightness; |
190 | bd->props.power = FB_BLANK_UNBLANK; | 193 | bd->props.power = FB_BLANK_UNBLANK; |
191 | backlight_update_status(bd); | 194 | backlight_update_status(bd); |