diff options
| author | H. Peter Anvin | 2011-08-05 21:25:56 +0200 |
|---|---|---|
| committer | H. Peter Anvin | 2011-08-05 21:25:56 +0200 |
| commit | 13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2 (patch) | |
| tree | 6a81d50b611170ca6dd1ed9cce2b86dd19f190d8 /drivers/gpu/drm/i915/intel_display.c | |
| parent | x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message (diff) | |
| parent | Linux 3.0 (diff) | |
| download | kernel-qcow2-linux-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.tar.gz kernel-qcow2-linux-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.tar.xz kernel-qcow2-linux-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.zip | |
Merge commit 'v3.0' into x86/cpu
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 21b6f93fe919..0f1c799afea1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4305,7 +4305,8 @@ 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; + return dev_priv->lvds_use_ssc && i915_panel_use_ssc + && !(dev_priv->quirks & QUIRK_LVDS_SSC_DISABLE); } static int i9xx_crtc_mode_set(struct drm_crtc *crtc, @@ -7810,6 +7811,15 @@ static void quirk_pipea_force (struct drm_device *dev) DRM_DEBUG_DRIVER("applying pipe a force quirk\n"); } +/* + * Some machines (Lenovo U160) do not work with SSC on LVDS for some reason + */ +static void quirk_ssc_force_disable(struct drm_device *dev) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + dev_priv->quirks |= QUIRK_LVDS_SSC_DISABLE; +} + struct intel_quirk { int device; int subsystem_vendor; @@ -7838,6 +7848,9 @@ struct intel_quirk intel_quirks[] = { /* 855 & before need to leave pipe A & dpll A up */ { 0x3582, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force }, { 0x2562, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force }, + + /* Lenovo U160 cannot use SSC on LVDS */ + { 0x0046, 0x17aa, 0x3920, quirk_ssc_force_disable }, }; static void intel_init_quirks(struct drm_device *dev) |