From: Alexandre Courbot <acourbot@nvidia.com>
To: Thierry Reding <thierry.reding@avionic-design.de>
Cc: linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org,
Alexandre Courbot <acourbot@nvidia.com>
Subject: [PATCH] pwm_backlight: pass correct brightness to callback
Date: Mon, 09 Jul 2012 04:21:40 +0000 [thread overview]
Message-ID: <1341807700-7103-1-git-send-email-acourbot@nvidia.com> (raw)
pwm_backlight_update_status calls two callbacks before and after
applying the new PWM settings. However, the brightness scale is
completely changed in between if brightness levels are used. This patch
ensures that both callbacks are passed brightness values of the same
meaning.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
---
drivers/video/backlight/pwm_bl.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 057389d..dd4d24d 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -39,6 +39,7 @@ static int pwm_backlight_update_status(struct backlight_device *bl)
{
struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev);
int brightness = bl->props.brightness;
+ int pwm_brightness;
int max = bl->props.max_brightness;
if (bl->props.power != FB_BLANK_UNBLANK)
@@ -55,13 +56,14 @@ static int pwm_backlight_update_status(struct backlight_device *bl)
pwm_disable(pb->pwm);
} else {
if (pb->levels) {
- brightness = pb->levels[brightness];
+ pwm_brightness = pb->levels[brightness];
max = pb->levels[max];
- }
+ } else
+ pwm_brightness = brightness;
- brightness = pb->lth_brightness +
- (brightness * (pb->period - pb->lth_brightness) / max);
- pwm_config(pb->pwm, brightness, pb->period);
+ pwm_brightness = pb->lth_brightness +
+ (pwm_brightness * (pb->period - pb->lth_brightness) / max);
+ pwm_config(pb->pwm, pwm_brightness, pb->period);
pwm_enable(pb->pwm);
}
--
1.7.11.1
next reply other threads:[~2012-07-09 4:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-09 4:21 Alexandre Courbot [this message]
2012-07-09 5:10 ` [PATCH] pwm_backlight: pass correct brightness to callback Thierry Reding
2012-07-09 5:27 ` Alex Courbot
2012-07-09 5:36 ` [PATCHv2] " Alexandre Courbot
2012-07-09 6:04 ` [PATCHv3] " Alexandre Courbot
2012-07-09 6:30 ` Thierry Reding
2012-07-09 5:11 ` [PATCH] " Jingoo Han
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1341807700-7103-1-git-send-email-acourbot@nvidia.com \
--to=acourbot@nvidia.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=thierry.reding@avionic-design.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).