diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-24 23:15:15 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-24 23:15:15 -0400 |
| commit | c373ba999103fa794f041eab5bd490714d2dee88 (patch) | |
| tree | 8f2b445b1e0af2491c83527967dbcda76054a486 /drivers/gpu/drm/i915/intel_bios.c | |
| parent | 6f3529f00a0a9ac06413d18d3926adf099cb59af (diff) | |
| parent | 851b147e4411df6a1e7e90e2a609773c277eefd2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 1e28c1652fd0..4337414846b6 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c | |||
| @@ -217,6 +217,9 @@ parse_general_features(struct drm_i915_private *dev_priv, | |||
| 217 | if (IS_I85X(dev_priv->dev)) | 217 | if (IS_I85X(dev_priv->dev)) |
| 218 | dev_priv->lvds_ssc_freq = | 218 | dev_priv->lvds_ssc_freq = |
| 219 | general->ssc_freq ? 66 : 48; | 219 | general->ssc_freq ? 66 : 48; |
| 220 | else if (IS_IGDNG(dev_priv->dev)) | ||
| 221 | dev_priv->lvds_ssc_freq = | ||
| 222 | general->ssc_freq ? 100 : 120; | ||
| 220 | else | 223 | else |
| 221 | dev_priv->lvds_ssc_freq = | 224 | dev_priv->lvds_ssc_freq = |
| 222 | general->ssc_freq ? 100 : 96; | 225 | general->ssc_freq ? 100 : 96; |