diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-29 10:01:28 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-29 10:01:28 -0700 |
| commit | 3e93457b45a1a8c69227ce596ee2005fa06f20dd (patch) | |
| tree | 248c27e432533b1af80a9b2240eaa8e48e3b87cc /drivers/gpu/drm/i915/intel_panel.c | |
| parent | 290414499cf94284a97cc3c33214d13ccfcd896a (diff) | |
| parent | c42ba72ec3a7a1b6aa30122931f1f4b91b601c31 (diff) | |
Merge tag 'ib-mfd-regulator-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps65090
Immutable branch between MFD and Regulator due for v3.16 merge-window.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_panel.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index cb058408c70e..0eead16aeda7 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -1065,6 +1065,11 @@ int intel_panel_setup_backlight(struct drm_connector *connector) unsigned long flags; int ret; + if (!dev_priv->vbt.backlight.present) { + DRM_DEBUG_KMS("native backlight control not available per VBT\n"); + return 0; + } + /* set level and max in panel struct */ spin_lock_irqsave(&dev_priv->backlight_lock, flags); ret = dev_priv->display.setup_backlight(intel_connector); |