diff options
| author | Wu Fengguang <fengguang.wu@intel.com> | 2011-12-09 13:42:17 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-12-20 04:15:24 +0100 |
| commit | b3f33cbf7ace8fc149993ee35e0d0fd57f41d6d8 (patch) | |
| tree | 316493c1185a8c12841b86eb5efe9637e5982d90 /drivers | |
| parent | Linux 3.2-rc6 (diff) | |
| download | linux-b3f33cbf7ace8fc149993ee35e0d0fd57f41d6d8.tar.xz linux-b3f33cbf7ace8fc149993ee35e0d0fd57f41d6d8.zip | |
drm/i915: fix ELD writing for SandyBridge
SandyBridge should be using the same register addresses as IvyBridge.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d809b038ca88..8a61b819b4bd 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5876,14 +5876,14 @@ static void ironlake_write_eld(struct drm_connector *connector, int aud_cntl_st; int aud_cntrl_st2; - if (IS_IVYBRIDGE(connector->dev)) { - hdmiw_hdmiedid = GEN7_HDMIW_HDMIEDID_A; - aud_cntl_st = GEN7_AUD_CNTRL_ST_A; - aud_cntrl_st2 = GEN7_AUD_CNTRL_ST2; - } else { + if (HAS_PCH_IBX(connector->dev)) { hdmiw_hdmiedid = GEN5_HDMIW_HDMIEDID_A; aud_cntl_st = GEN5_AUD_CNTL_ST_A; aud_cntrl_st2 = GEN5_AUD_CNTL_ST2; + } else { + hdmiw_hdmiedid = GEN7_HDMIW_HDMIEDID_A; + aud_cntl_st = GEN7_AUD_CNTRL_ST_A; + aud_cntrl_st2 = GEN7_AUD_CNTRL_ST2; } i = to_intel_crtc(crtc)->pipe; |