diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2016-05-17 14:57:58 +0200 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2016-05-17 14:57:58 +0200 |
| commit | 18c588786c08458f5d965d8735ab48f9e51e0b4b (patch) | |
| tree | 925893d58c00432f93830d1b83405c9d44d79bb8 /drivers/gpu | |
| parent | d2a3f206846b4b140aa1fe5be29499e9191fb1fe (diff) | |
| parent | 23e3523f5d3a980edf7f189743cf4bb9490400a9 (diff) | |
| download | linux-18c588786c08458f5d965d8735ab48f9e51e0b4b.tar.bz2 | |
Merge branch 'for-4.7/pwm-atomic' into for-next
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 6 |
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, return -ENODEV; } + /* + * FIXME: pwm_apply_args() should be removed when switching to + * the atomic PWM API. + */ + pwm_apply_args(panel->backlight.pwm); + retval = pwm_config(panel->backlight.pwm, CRC_PMIC_PWM_PERIOD_NS, CRC_PMIC_PWM_PERIOD_NS); if (retval < 0) { |