aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2011-12-09 07:42:17 -0500
committerKeith Packard <keithp@keithp.com>2011-12-19 22:15:24 -0500
commitb3f33cbf7ace8fc149993ee35e0d0fd57f41d6d8 (patch)
tree316493c1185a8c12841b86eb5efe9637e5982d90
parent384703b8e6cd4c8ef08512e596024e028c91c339 (diff)
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>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c10
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,
5876 int aud_cntl_st; 5876 int aud_cntl_st;
5877 int aud_cntrl_st2; 5877 int aud_cntrl_st2;
5878 5878
5879 if (IS_IVYBRIDGE(connector->dev)) { 5879 if (HAS_PCH_IBX(connector->dev)) {
5880 hdmiw_hdmiedid = GEN7_HDMIW_HDMIEDID_A;
5881 aud_cntl_st = GEN7_AUD_CNTRL_ST_A;
5882 aud_cntrl_st2 = GEN7_AUD_CNTRL_ST2;
5883 } else {
5884 hdmiw_hdmiedid = GEN5_HDMIW_HDMIEDID_A; 5880 hdmiw_hdmiedid = GEN5_HDMIW_HDMIEDID_A;
5885 aud_cntl_st = GEN5_AUD_CNTL_ST_A; 5881 aud_cntl_st = GEN5_AUD_CNTL_ST_A;
5886 aud_cntrl_st2 = GEN5_AUD_CNTL_ST2; 5882 aud_cntrl_st2 = GEN5_AUD_CNTL_ST2;
5883 } else {
5884 hdmiw_hdmiedid = GEN7_HDMIW_HDMIEDID_A;
5885 aud_cntl_st = GEN7_AUD_CNTRL_ST_A;
5886 aud_cntrl_st2 = GEN7_AUD_CNTRL_ST2;
5887 } 5887 }
5888 5888
5889 i = to_intel_crtc(crtc)->pipe; 5889 i = to_intel_crtc(crtc)->pipe;