diff options
author | Eric Anholt <eric@anholt.net> | 2010-01-28 19:45:52 -0500 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-02-26 16:23:20 -0500 |
commit | c619eed4b2ee1b2bde3e02464eb81632a08bb976 (patch) | |
tree | b017349c3626233d872b185efb38135f91b1abd5 /drivers/gpu/drm/i915/intel_dp.c | |
parent | faa7bde6cb1227d13d011042f17bda0869c3bd1e (diff) |
drm/i915: More s/IS_IRONLAKE/HAS_PCH_SPLIT for Sandybridge.
I think this is pretty much correct. Not really tested.
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 439506cefc14..3ef3a0d0edd0 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -231,7 +231,7 @@ intel_dp_aux_ch(struct intel_output *intel_output, | |||
231 | */ | 231 | */ |
232 | if (IS_eDP(intel_output)) | 232 | if (IS_eDP(intel_output)) |
233 | aux_clock_divider = 225; /* eDP input clock at 450Mhz */ | 233 | aux_clock_divider = 225; /* eDP input clock at 450Mhz */ |
234 | else if (IS_IRONLAKE(dev)) | 234 | else if (HAS_PCH_SPLIT(dev)) |
235 | aux_clock_divider = 62; /* IRL input clock fixed at 125Mhz */ | 235 | aux_clock_divider = 62; /* IRL input clock fixed at 125Mhz */ |
236 | else | 236 | else |
237 | aux_clock_divider = intel_hrawclk(dev) / 2; | 237 | aux_clock_divider = intel_hrawclk(dev) / 2; |
@@ -584,7 +584,7 @@ intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode, | |||
584 | intel_dp_compute_m_n(3, lane_count, | 584 | intel_dp_compute_m_n(3, lane_count, |
585 | mode->clock, adjusted_mode->clock, &m_n); | 585 | mode->clock, adjusted_mode->clock, &m_n); |
586 | 586 | ||
587 | if (IS_IRONLAKE(dev)) { | 587 | if (HAS_PCH_SPLIT(dev)) { |
588 | if (intel_crtc->pipe == 0) { | 588 | if (intel_crtc->pipe == 0) { |
589 | I915_WRITE(TRANSA_DATA_M1, | 589 | I915_WRITE(TRANSA_DATA_M1, |
590 | ((m_n.tu - 1) << PIPE_GMCH_DATA_M_TU_SIZE_SHIFT) | | 590 | ((m_n.tu - 1) << PIPE_GMCH_DATA_M_TU_SIZE_SHIFT) | |
@@ -1176,7 +1176,7 @@ intel_dp_detect(struct drm_connector *connector) | |||
1176 | 1176 | ||
1177 | dp_priv->has_audio = false; | 1177 | dp_priv->has_audio = false; |
1178 | 1178 | ||
1179 | if (IS_IRONLAKE(dev)) | 1179 | if (HAS_PCH_SPLIT(dev)) |
1180 | return ironlake_dp_detect(connector); | 1180 | return ironlake_dp_detect(connector); |
1181 | 1181 | ||
1182 | temp = I915_READ(PORT_HOTPLUG_EN); | 1182 | temp = I915_READ(PORT_HOTPLUG_EN); |