aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2016-04-14 15:17:35 -0400
committerThierry Reding <thierry.reding@gmail.com>2016-05-17 08:45:07 -0400
commit2347aa7c34be284b266ab6b5f2bdf5daf14f582e (patch)
treeb43a79fbc7bb93fec7a6d78ab855866afcd33c4a
parentcfae56f18c7cbdb0542025b0d3f000d9ba0152d0 (diff)
drm: i915: Explicitly apply PWM config extracted from pwm_args
Call pwm_apply_args() just after requesting the PWM device so that the polarity and period are initialized according to the information provided in pwm_args. This is an intermediate state, and pwm_apply_args() should be dropped as soon as the atomic PWM infrastructure is in place and the driver makes use of it. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-rw-r--r--drivers/gpu/drm/i915/intel_panel.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 21ee6477bf98..dc3a2e4f74c2 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1640,6 +1640,12 @@ static int pwm_setup_backlight(struct intel_connector *connector,
1640 return -ENODEV; 1640 return -ENODEV;
1641 } 1641 }
1642 1642
1643 /*
1644 * FIXME: pwm_apply_args() should be removed when switching to
1645 * the atomic PWM API.
1646 */
1647 pwm_apply_args(panel->backlight.pwm);
1648
1643 retval = pwm_config(panel->backlight.pwm, CRC_PMIC_PWM_PERIOD_NS, 1649 retval = pwm_config(panel->backlight.pwm, CRC_PMIC_PWM_PERIOD_NS,
1644 CRC_PMIC_PWM_PERIOD_NS); 1650 CRC_PMIC_PWM_PERIOD_NS);
1645 if (retval < 0) { 1651 if (retval < 0) {