diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-16 19:32:17 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 06:19:45 -0400 |
commit | a6c45cf013a57e32ddae43dd4ac911eb4a3919fd (patch) | |
tree | 21ce3ea9dcbeb815c92eb0a17377e5061b33151c /drivers/gpu/drm/i915/intel_sdvo.c | |
parent | 219adae138513bae20b256f1946b9cb3b75ca05c (diff) |
drm/i915: INTEL_INFO->gen supercedes i8xx, i9xx, i965g
Avoid confusion between i965g meaning broadwater and the gen4+ chipset
families.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index ba058e600ce7..7cd2d9592d65 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -1162,7 +1162,7 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, | |||
1162 | return; | 1162 | return; |
1163 | 1163 | ||
1164 | /* Set the SDVO control regs. */ | 1164 | /* Set the SDVO control regs. */ |
1165 | if (IS_I965G(dev)) { | 1165 | if (INTEL_INFO(dev)->gen >= 4) { |
1166 | sdvox = SDVO_BORDER_ENABLE; | 1166 | sdvox = SDVO_BORDER_ENABLE; |
1167 | if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) | 1167 | if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) |
1168 | sdvox |= SDVO_VSYNC_ACTIVE_HIGH; | 1168 | sdvox |= SDVO_VSYNC_ACTIVE_HIGH; |
@@ -1185,7 +1185,7 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, | |||
1185 | if (intel_sdvo->is_hdmi) | 1185 | if (intel_sdvo->is_hdmi) |
1186 | sdvox |= SDVO_AUDIO_ENABLE; | 1186 | sdvox |= SDVO_AUDIO_ENABLE; |
1187 | 1187 | ||
1188 | if (IS_I965G(dev)) { | 1188 | if (INTEL_INFO(dev)->gen >= 4) { |
1189 | /* done in crtc_mode_set as the dpll_md reg must be written early */ | 1189 | /* done in crtc_mode_set as the dpll_md reg must be written early */ |
1190 | } else if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev)) { | 1190 | } else if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev)) { |
1191 | /* done in crtc_mode_set as it lives inside the dpll register */ | 1191 | /* done in crtc_mode_set as it lives inside the dpll register */ |