diff options
| author | Wu Fengguang <fengguang.wu@intel.com> | 2012-02-08 11:48:16 +0800 |
|---|---|---|
| committer | Eugeni Dodonov <eugeni.dodonov@intel.com> | 2012-02-28 10:01:12 -0300 |
| commit | 1c8dcfa4f5cb010d13d40e00e6a08527236578b6 (patch) | |
| tree | 9b2393887f305fafcabc952f8a1340823320c1be | |
| parent | 136954edcd3f0dc0865ed3a37e13c999b7de9a4c (diff) | |
drm/i915: fix ELD writing for SandyBridge3.2-drm-intel-stable
Description for stable update: this allows Sandy Bridge machines to have
the same functionality as the Ivy Bridge ones. They are using same set of
registers, but those were omitted for Sandy Bridge previously.
commit b3f33cbf7ace8fc149993ee35e0d0fd57f41d6d8 upstream.
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>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
| -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 b850f2b7e62..6760ef915f7 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; |