From 44a98b30ed04eccbb0753032658ca1389b1cdf78 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 13 Jul 2020 19:44:25 -0700 Subject: [PATCH] ANDROID: fix bad revert of "FROMLIST: pwm: Convert period and duty cycle to u64" This fixes a bad revert of a FROMLIST patch which got upstreamed in a slightly different form. This makes the code match upstream. Fixes: fd0cd972812c ("Revert "FROMLIST: pwm: Convert period and duty cycle to u64"") Change-Id: Ic5e7289d9cbf2c93e0982d02c7d3a79ebffa06b8 Signed-off-by: Eric Biggers --- drivers/gpu/drm/i915/display/intel_panel.c | 9 ++++----- drivers/media/rc/ir-rx51.c | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c index 550d5d86f1ac..3c5056dbf607 100644 --- a/drivers/gpu/drm/i915/display/intel_panel.c +++ b/drivers/gpu/drm/i915/display/intel_panel.c @@ -1929,11 +1929,10 @@ static int pwm_setup_backlight(struct intel_connector *connector, return retval; } - panel->backlight.min = 0; /* 0% */ - panel->backlight.max = 100; /* 100% */ - panel->backlight.level = DIV_ROUND_UP( - pwm_get_duty_cycle(panel->backlight.pwm) * 100, - CRC_PMIC_PWM_PERIOD_NS); + level = DIV_ROUND_UP(pwm_get_duty_cycle(panel->backlight.pwm) * 100, + CRC_PMIC_PWM_PERIOD_NS); + panel->backlight.level = + intel_panel_compute_brightness(connector, level); panel->backlight.enabled = panel->backlight.level != 0; drm_info(&dev_priv->drm, "Using %s PWM for LCD backlight control\n", diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c index 8574eda45102..a0d9c02a7588 100644 --- a/drivers/media/rc/ir-rx51.c +++ b/drivers/media/rc/ir-rx51.c @@ -241,7 +241,7 @@ static int ir_rx51_probe(struct platform_device *dev) } /* Use default, in case userspace does not set the carrier */ - ir_rx51.freq = DIV_ROUND_CLOSEST(pwm_get_period(pwm), NSEC_PER_SEC); + ir_rx51.freq = DIV_ROUND_CLOSEST_ULL(pwm_get_period(pwm), NSEC_PER_SEC); pwm_put(pwm); hrtimer_init(&ir_rx51.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);