diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2007-02-08 17:25:09 -0500 |
---|---|---|
committer | Richard Purdie <rpurdie@rpsys.net> | 2007-02-20 03:38:45 -0500 |
commit | 28ee086d5b36aab2931f6740e409bb0fb6c65e5f (patch) | |
tree | 0a308c80affcc39c2c869f29f1109e5ee9d6140f /drivers/video/aty/atyfb_base.c | |
parent | a8db3c1948eb30cd6988b5b96b654f591e6280b1 (diff) |
backlight: Fix external uses of backlight internal semaphore
backlight_device->sem has a very specific use as documented in the
header file. The external users of this are using it for a different
reason, to serialise access to the update_status() method.
backlight users were supposed to implement their own internal
serialisation of update_status() if needed but everyone is doing
things differently and incorrectly. Therefore add a global mutex to
take care of serialisation for everyone, once and for all.
Locking for get_brightness remains optional since most users don't
need it.
Also update the lcd class in a similar way.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Diffstat (limited to 'drivers/video/aty/atyfb_base.c')
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 5ea5a00e58a3..23deb3566020 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -2188,10 +2188,8 @@ static void aty_bl_set_power(struct fb_info *info, int power) | |||
2188 | mutex_lock(&info->bl_mutex); | 2188 | mutex_lock(&info->bl_mutex); |
2189 | 2189 | ||
2190 | if (info->bl_dev) { | 2190 | if (info->bl_dev) { |
2191 | down(&info->bl_dev->sem); | ||
2192 | info->bl_dev->props->power = power; | 2191 | info->bl_dev->props->power = power; |
2193 | __aty_bl_update_status(info->bl_dev); | 2192 | __aty_bl_update_status(info->bl_dev); |
2194 | up(&info->bl_dev->sem); | ||
2195 | } | 2193 | } |
2196 | 2194 | ||
2197 | mutex_unlock(&info->bl_mutex); | 2195 | mutex_unlock(&info->bl_mutex); |
@@ -2224,11 +2222,9 @@ static void aty_bl_init(struct atyfb_par *par) | |||
2224 | 0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL); | 2222 | 0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL); |
2225 | mutex_unlock(&info->bl_mutex); | 2223 | mutex_unlock(&info->bl_mutex); |
2226 | 2224 | ||
2227 | down(&bd->sem); | ||
2228 | bd->props->brightness = aty_bl_data.max_brightness; | 2225 | bd->props->brightness = aty_bl_data.max_brightness; |
2229 | bd->props->power = FB_BLANK_UNBLANK; | 2226 | bd->props->power = FB_BLANK_UNBLANK; |
2230 | bd->props->update_status(bd); | 2227 | backlight_update_status(bd); |
2231 | up(&bd->sem); | ||
2232 | 2228 | ||
2233 | #ifdef CONFIG_PMAC_BACKLIGHT | 2229 | #ifdef CONFIG_PMAC_BACKLIGHT |
2234 | mutex_lock(&pmac_backlight_mutex); | 2230 | mutex_lock(&pmac_backlight_mutex); |