diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-21 14:57:17 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-21 19:08:39 +0100 |
commit | f00a3ddf91d596bece5fa31e8ce2e8a3b4c0623b (patch) | |
tree | cae4beb61a2ae44ffa6d892bbd207b4022094dc2 /drivers/gpu/drm/i915/intel_bios.c | |
parent | 549f7365820a212a1cfd0871d377b1ad0d1e5723 (diff) | |
download | op-kernel-dev-f00a3ddf91d596bece5fa31e8ce2e8a3b4c0623b.zip op-kernel-dev-f00a3ddf91d596bece5fa31e8ce2e8a3b4c0623b.tar.gz |
drm/i915: IS_IRONLAKE is synonymous with gen == 5
So remove the redundant bit in the capabilities block and
s/IS_IRONLAKE/IS_GEN5/.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index b9560f3..b0b1200 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -265,10 +265,10 @@ parse_general_features(struct drm_i915_private *dev_priv, dev_priv->lvds_use_ssc = general->enable_ssc; if (dev_priv->lvds_use_ssc) { - if (IS_I85X(dev_priv->dev)) + if (IS_I85X(dev)) dev_priv->lvds_ssc_freq = general->ssc_freq ? 66 : 48; - else if (IS_IRONLAKE(dev_priv->dev) || IS_GEN6(dev)) + else if (IS_GEN5(dev) || IS_GEN6(dev)) dev_priv->lvds_ssc_freq = general->ssc_freq ? 100 : 120; else |