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/riva | |
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/riva')
-rw-r--r-- | drivers/video/riva/fbdev.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index fd825711bb63..b70d18f7fcd9 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c | |||
@@ -357,10 +357,8 @@ static void riva_bl_set_power(struct fb_info *info, int power) | |||
357 | mutex_lock(&info->bl_mutex); | 357 | mutex_lock(&info->bl_mutex); |
358 | 358 | ||
359 | if (info->bl_dev) { | 359 | if (info->bl_dev) { |
360 | down(&info->bl_dev->sem); | ||
361 | info->bl_dev->props->power = power; | 360 | info->bl_dev->props->power = power; |
362 | __riva_bl_update_status(info->bl_dev); | 361 | __riva_bl_update_status(info->bl_dev); |
363 | up(&info->bl_dev->sem); | ||
364 | } | 362 | } |
365 | 363 | ||
366 | mutex_unlock(&info->bl_mutex); | 364 | mutex_unlock(&info->bl_mutex); |
@@ -397,11 +395,9 @@ static void riva_bl_init(struct riva_par *par) | |||
397 | FB_BACKLIGHT_MAX); | 395 | FB_BACKLIGHT_MAX); |
398 | mutex_unlock(&info->bl_mutex); | 396 | mutex_unlock(&info->bl_mutex); |
399 | 397 | ||
400 | down(&bd->sem); | ||
401 | bd->props->brightness = riva_bl_data.max_brightness; | 398 | bd->props->brightness = riva_bl_data.max_brightness; |
402 | bd->props->power = FB_BLANK_UNBLANK; | 399 | bd->props->power = FB_BLANK_UNBLANK; |
403 | bd->props->update_status(bd); | 400 | backlight_update_status(bd); |
404 | up(&bd->sem); | ||
405 | 401 | ||
406 | #ifdef CONFIG_PMAC_BACKLIGHT | 402 | #ifdef CONFIG_PMAC_BACKLIGHT |
407 | mutex_lock(&pmac_backlight_mutex); | 403 | mutex_lock(&pmac_backlight_mutex); |