diff options
| author | Keith Packard <keithp@keithp.com> | 2011-09-26 16:09:45 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-09-27 11:12:40 -0700 |
| commit | 72bbe58cd9568c7766cc219a779ea68a02132797 (patch) | |
| tree | c782e65997335f19534ab57146c25128617de248 /drivers/gpu/drm/i915/intel_display.c | |
| parent | d2830bdb84fac6e84e45ffe1a4c9bec762295d7d (diff) | |
drm/i915: Allow SSC parameter to override VBT value
Allow SSC to be enabled even when the BIOS disables it for testing SSC paths.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 04411ad2e779..603949622104 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4584,7 +4584,9 @@ static void intel_update_watermarks(struct drm_device *dev) static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv) { - return dev_priv->lvds_use_ssc && i915_panel_use_ssc + if (i915_panel_use_ssc >= 0) + return i915_panel_use_ssc != 0; + return dev_priv->lvds_use_ssc && !(dev_priv->quirks & QUIRK_LVDS_SSC_DISABLE); } |