diff options
| author | Jani Nikula | 2014-10-10 16:53:33 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-10-24 16:34:09 +0200 |
| commit | e6b2627c6a8b25afc85649b54987b4bea27875b1 (patch) | |
| tree | 12169c244904cfd37887526f679dfd0fddbeb733 /drivers/gpu/drm/i915/intel_panel.c | |
| parent | drm/i915: preserve swizzle settings if necessary v4 (diff) | |
| download | kernel-qcow2-linux-e6b2627c6a8b25afc85649b54987b4bea27875b1.tar.gz kernel-qcow2-linux-e6b2627c6a8b25afc85649b54987b4bea27875b1.tar.xz kernel-qcow2-linux-e6b2627c6a8b25afc85649b54987b4bea27875b1.zip | |
drm/i915: spt does not have pch backlight override bit
SPT is always in the PCH override mode, and the bit MBZ. Only set
override on LPT.
v2: check for PCH version (Ville)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_panel.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index e3def5ad4a77..e18b3f49074c 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -775,8 +775,9 @@ static void bdw_enable_backlight(struct intel_connector *connector) if (panel->backlight.active_low_pwm) pch_ctl1 |= BLM_PCH_POLARITY; - /* BDW always uses the pch pwm controls. */ - pch_ctl1 |= BLM_PCH_OVERRIDE_ENABLE; + /* After LPT, override is the default. */ + if (HAS_PCH_LPT(dev_priv)) + pch_ctl1 |= BLM_PCH_OVERRIDE_ENABLE; I915_WRITE(BLC_PWM_PCH_CTL1, pch_ctl1); POSTING_READ(BLC_PWM_PCH_CTL1); |