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/nvidia | |
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/nvidia')
-rw-r--r-- | drivers/video/nvidia/nv_backlight.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c index 4254c090dc4b..f5e42d0bd0da 100644 --- a/drivers/video/nvidia/nv_backlight.c +++ b/drivers/video/nvidia/nv_backlight.c | |||
@@ -114,10 +114,8 @@ void nvidia_bl_set_power(struct fb_info *info, int power) | |||
114 | mutex_lock(&info->bl_mutex); | 114 | mutex_lock(&info->bl_mutex); |
115 | 115 | ||
116 | if (info->bl_dev) { | 116 | if (info->bl_dev) { |
117 | down(&info->bl_dev->sem); | ||
118 | info->bl_dev->props->power = power; | 117 | info->bl_dev->props->power = power; |
119 | __nvidia_bl_update_status(info->bl_dev); | 118 | __nvidia_bl_update_status(info->bl_dev); |
120 | up(&info->bl_dev->sem); | ||
121 | } | 119 | } |
122 | 120 | ||
123 | mutex_unlock(&info->bl_mutex); | 121 | mutex_unlock(&info->bl_mutex); |
@@ -154,11 +152,9 @@ void nvidia_bl_init(struct nvidia_par *par) | |||
154 | 0x534 * FB_BACKLIGHT_MAX / MAX_LEVEL); | 152 | 0x534 * FB_BACKLIGHT_MAX / MAX_LEVEL); |
155 | mutex_unlock(&info->bl_mutex); | 153 | mutex_unlock(&info->bl_mutex); |
156 | 154 | ||
157 | down(&bd->sem); | ||
158 | bd->props->brightness = nvidia_bl_data.max_brightness; | 155 | bd->props->brightness = nvidia_bl_data.max_brightness; |
159 | bd->props->power = FB_BLANK_UNBLANK; | 156 | bd->props->power = FB_BLANK_UNBLANK; |
160 | bd->props->update_status(bd); | 157 | backlight_update_status(bd); |
161 | up(&bd->sem); | ||
162 | 158 | ||
163 | #ifdef CONFIG_PMAC_BACKLIGHT | 159 | #ifdef CONFIG_PMAC_BACKLIGHT |
164 | mutex_lock(&pmac_backlight_mutex); | 160 | mutex_lock(&pmac_backlight_mutex); |