diff options
| author | Benjamin LaHaise <bcrl@kvack.org> | 2014-07-14 19:14:27 +0200 |
|---|---|---|
| committer | Benjamin LaHaise <bcrl@kvack.org> | 2014-07-14 19:14:27 +0200 |
| commit | 6e830d53717cf3d5c30c1afce3773ef97e436cd9 (patch) | |
| tree | 9376a0424b8f9fff12d107aa2498e775da20e85d /drivers/gpu/drm/i915/intel_panel.c | |
| parent | aio: kill the misleading rcu read locks in ioctx_add_table() and kill_ioctx() (diff) | |
| parent | aio: protect reqs_available updates from changes in interrupt handlers (diff) | |
| download | linux-6e830d53717cf3d5c30c1afce3773ef97e436cd9.tar.xz linux-6e830d53717cf3d5c30c1afce3773ef97e436cd9.zip | |
Merge ../aio-fixes
Diffstat (limited to 'drivers/gpu/drm/i915/intel_panel.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index 38a98570d10c..628cd8938274 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -1118,8 +1118,12 @@ int intel_panel_setup_backlight(struct drm_connector *connector) int ret; if (!dev_priv->vbt.backlight.present) { - DRM_DEBUG_KMS("native backlight control not available per VBT\n"); - return 0; + if (dev_priv->quirks & QUIRK_BACKLIGHT_PRESENT) { + DRM_DEBUG_KMS("no backlight present per VBT, but present per quirk\n"); + } else { + DRM_DEBUG_KMS("no backlight present per VBT\n"); + return 0; + } } /* set level and max in panel struct */ |