* [PATCH 0/5] Intel HDMI ELD fixes v2
@ 2011-12-09 12:42 ` Wu Fengguang
0 siblings, 0 replies; 14+ messages in thread
From: Wu Fengguang @ 2011-12-09 12:42 UTC (permalink / raw)
To: Keith Packard
Cc: Takashi Iwai, Sander Jansen, Christopher White,
intel-gfx@lists.freedesktop.org, Pierre-louis Bossart ,
Zhenyu Wang, Jeremy Bush, Wu Fengguang, LKML
Keith,
The complete set of fixes for passing HDMI/DP ELD to audio driver.
[PATCH 1/5] drm/i915: fix ELD writing for SandyBridge
[PATCH 2/5] drm/i915: rename audio ELD registers
[PATCH 3/5] drm/i915: dont trigger hotplug events on unchanged ELD
[PATCH 4/5] drm/i915: HDMI hot remove notification to audio driver
[PATCH 5/5] drm/i915: DisplayPort hot remove notification to audio driver
drivers/gpu/drm/i915/i915_reg.h | 22 +++----
drivers/gpu/drm/i915/intel_display.c | 75 +++++++++++++++++++------
drivers/gpu/drm/i915/intel_dp.c | 1
drivers/gpu/drm/i915/intel_hdmi.c | 8 ++
4 files changed, 76 insertions(+), 30 deletions(-)
Thanks,
Fengguang
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/5] drm/i915: fix ELD writing for SandyBridge
2011-12-09 12:42 ` Wu Fengguang
@ 2011-12-09 12:42 ` Wu Fengguang
-1 siblings, 0 replies; 14+ messages in thread
From: Wu Fengguang @ 2011-12-09 12:42 UTC (permalink / raw)
To: Keith Packard
Cc: Takashi Iwai, Wu Fengguang, Sander Jansen, Christopher White,
intel-gfx@lists.freedesktop.org, Pierre-louis Bossart,
Zhenyu Wang, Jeremy Bush, LKML
[-- Attachment #1: sandybridge-eld-fix --]
[-- Type: text/plain, Size: 1006 bytes --]
SandyBridge should be using the same register addresses as IvyBridge.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- linux.orig/drivers/gpu/drm/i915/intel_display.c 2011-11-28 15:33:04.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_display.c 2011-11-29 19:51:28.000000000 +0800
@@ -5857,14 +5857,14 @@ static void ironlake_write_eld(struct dr
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;
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 1/5] drm/i915: fix ELD writing for SandyBridge
@ 2011-12-09 12:42 ` Wu Fengguang
0 siblings, 0 replies; 14+ messages in thread
From: Wu Fengguang @ 2011-12-09 12:42 UTC (permalink / raw)
To: Keith Packard
Cc: Takashi Iwai, Wu Fengguang, Sander Jansen, Christopher White,
intel-gfx@lists.freedesktop.org, Pierre-louis Bossart ,
Zhenyu Wang, Jeremy Bush, LKML
[-- Attachment #1: sandybridge-eld-fix --]
[-- Type: text/plain, Size: 1008 bytes --]
SandyBridge should be using the same register addresses as IvyBridge.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- linux.orig/drivers/gpu/drm/i915/intel_display.c 2011-11-28 15:33:04.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_display.c 2011-11-29 19:51:28.000000000 +0800
@@ -5857,14 +5857,14 @@ static void ironlake_write_eld(struct dr
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;
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/5] drm/i915: rename audio ELD registers
2011-12-09 12:42 ` Wu Fengguang
@ 2011-12-09 12:42 ` Wu Fengguang
-1 siblings, 0 replies; 14+ messages in thread
From: Wu Fengguang @ 2011-12-09 12:42 UTC (permalink / raw)
To: Keith Packard
Cc: Zhenyu Wang, Takashi Iwai, intel-gfx@lists.freedesktop.org, LKML,
Jeremy Bush, Christopher White, Wu Fengguang,
Pierre-louis Bossart
[-- Attachment #1: sandybridge-eld-reg-rename --]
[-- Type: text/plain, Size: 3291 bytes --]
Change the definitions from GEN5 to IBX as they aren't in the CPU and
some SNB systems actually shipped with IBX chipsets (or, at least that's
a supported configuration).
The GEN7_* register addresses actually take effect since GEN6 and should
be prefixed by CPT, the PCH code name.
Suggested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
drivers/gpu/drm/i915/i915_reg.h | 22 +++++++++++-----------
drivers/gpu/drm/i915/intel_display.c | 22 +++++++++++-----------
2 files changed, 22 insertions(+), 22 deletions(-)
--- linux.orig/drivers/gpu/drm/i915/i915_reg.h 2011-11-29 19:50:27.000000000 +0800
+++ linux/drivers/gpu/drm/i915/i915_reg.h 2011-11-29 19:51:38.000000000 +0800
@@ -3534,17 +3534,17 @@
#define G4X_ELD_ACK (1 << 4)
#define G4X_HDMIW_HDMIEDID 0x6210C
-#define GEN5_HDMIW_HDMIEDID_A 0xE2050
-#define GEN5_AUD_CNTL_ST_A 0xE20B4
-#define GEN5_ELD_BUFFER_SIZE (0x1f << 10)
-#define GEN5_ELD_ADDRESS (0x1f << 5)
-#define GEN5_ELD_ACK (1 << 4)
-#define GEN5_AUD_CNTL_ST2 0xE20C0
-#define GEN5_ELD_VALIDB (1 << 0)
-#define GEN5_CP_READYB (1 << 1)
+#define IBX_HDMIW_HDMIEDID_A 0xE2050
+#define IBX_AUD_CNTL_ST_A 0xE20B4
+#define IBX_ELD_BUFFER_SIZE (0x1f << 10)
+#define IBX_ELD_ADDRESS (0x1f << 5)
+#define IBX_ELD_ACK (1 << 4)
+#define IBX_AUD_CNTL_ST2 0xE20C0
+#define IBX_ELD_VALIDB (1 << 0)
+#define IBX_CP_READYB (1 << 1)
-#define GEN7_HDMIW_HDMIEDID_A 0xE5050
-#define GEN7_AUD_CNTRL_ST_A 0xE50B4
-#define GEN7_AUD_CNTRL_ST2 0xE50C0
+#define CPT_HDMIW_HDMIEDID_A 0xE5050
+#define CPT_AUD_CNTL_ST_A 0xE50B4
+#define CPT_AUD_CNTRL_ST2 0xE50C0
#endif /* _I915_REG_H_ */
--- linux.orig/drivers/gpu/drm/i915/intel_display.c 2011-11-29 19:51:28.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_display.c 2011-11-29 19:52:01.000000000 +0800
@@ -5858,13 +5858,13 @@ static void ironlake_write_eld(struct dr
int aud_cntrl_st2;
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;
+ hdmiw_hdmiedid = IBX_HDMIW_HDMIEDID_A;
+ aud_cntl_st = IBX_AUD_CNTL_ST_A;
+ aud_cntrl_st2 = IBX_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;
+ hdmiw_hdmiedid = CPT_HDMIW_HDMIEDID_A;
+ aud_cntl_st = CPT_AUD_CNTL_ST_A;
+ aud_cntrl_st2 = CPT_AUD_CNTRL_ST2;
}
i = to_intel_crtc(crtc)->pipe;
@@ -5878,12 +5878,12 @@ static void ironlake_write_eld(struct dr
if (!i) {
DRM_DEBUG_DRIVER("Audio directed to unknown port\n");
/* operate blindly on all ports */
- eldv = GEN5_ELD_VALIDB;
- eldv |= GEN5_ELD_VALIDB << 4;
- eldv |= GEN5_ELD_VALIDB << 8;
+ eldv = IBX_ELD_VALIDB;
+ eldv |= IBX_ELD_VALIDB << 4;
+ eldv |= IBX_ELD_VALIDB << 8;
} else {
DRM_DEBUG_DRIVER("ELD on port %c\n", 'A' + i);
- eldv = GEN5_ELD_VALIDB << ((i - 1) * 4);
+ eldv = IBX_ELD_VALIDB << ((i - 1) * 4);
}
i = I915_READ(aud_cntrl_st2);
@@ -5899,7 +5899,7 @@ static void ironlake_write_eld(struct dr
}
i = I915_READ(aud_cntl_st);
- i &= ~GEN5_ELD_ADDRESS;
+ i &= ~IBX_ELD_ADDRESS;
I915_WRITE(aud_cntl_st, i);
len = min_t(uint8_t, eld[2], 21); /* 84 bytes of hw ELD buffer */
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 2/5] drm/i915: rename audio ELD registers
@ 2011-12-09 12:42 ` Wu Fengguang
0 siblings, 0 replies; 14+ messages in thread
From: Wu Fengguang @ 2011-12-09 12:42 UTC (permalink / raw)
To: Keith Packard
Cc: Takashi Iwai, Wu Fengguang, Sander Jansen, Christopher White,
intel-gfx@lists.freedesktop.org, Pierre-louis Bossart ,
Zhenyu Wang, Jeremy Bush, LKML
[-- Attachment #1: sandybridge-eld-reg-rename --]
[-- Type: text/plain, Size: 3293 bytes --]
Change the definitions from GEN5 to IBX as they aren't in the CPU and
some SNB systems actually shipped with IBX chipsets (or, at least that's
a supported configuration).
The GEN7_* register addresses actually take effect since GEN6 and should
be prefixed by CPT, the PCH code name.
Suggested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
drivers/gpu/drm/i915/i915_reg.h | 22 +++++++++++-----------
drivers/gpu/drm/i915/intel_display.c | 22 +++++++++++-----------
2 files changed, 22 insertions(+), 22 deletions(-)
--- linux.orig/drivers/gpu/drm/i915/i915_reg.h 2011-11-29 19:50:27.000000000 +0800
+++ linux/drivers/gpu/drm/i915/i915_reg.h 2011-11-29 19:51:38.000000000 +0800
@@ -3534,17 +3534,17 @@
#define G4X_ELD_ACK (1 << 4)
#define G4X_HDMIW_HDMIEDID 0x6210C
-#define GEN5_HDMIW_HDMIEDID_A 0xE2050
-#define GEN5_AUD_CNTL_ST_A 0xE20B4
-#define GEN5_ELD_BUFFER_SIZE (0x1f << 10)
-#define GEN5_ELD_ADDRESS (0x1f << 5)
-#define GEN5_ELD_ACK (1 << 4)
-#define GEN5_AUD_CNTL_ST2 0xE20C0
-#define GEN5_ELD_VALIDB (1 << 0)
-#define GEN5_CP_READYB (1 << 1)
+#define IBX_HDMIW_HDMIEDID_A 0xE2050
+#define IBX_AUD_CNTL_ST_A 0xE20B4
+#define IBX_ELD_BUFFER_SIZE (0x1f << 10)
+#define IBX_ELD_ADDRESS (0x1f << 5)
+#define IBX_ELD_ACK (1 << 4)
+#define IBX_AUD_CNTL_ST2 0xE20C0
+#define IBX_ELD_VALIDB (1 << 0)
+#define IBX_CP_READYB (1 << 1)
-#define GEN7_HDMIW_HDMIEDID_A 0xE5050
-#define GEN7_AUD_CNTRL_ST_A 0xE50B4
-#define GEN7_AUD_CNTRL_ST2 0xE50C0
+#define CPT_HDMIW_HDMIEDID_A 0xE5050
+#define CPT_AUD_CNTL_ST_A 0xE50B4
+#define CPT_AUD_CNTRL_ST2 0xE50C0
#endif /* _I915_REG_H_ */
--- linux.orig/drivers/gpu/drm/i915/intel_display.c 2011-11-29 19:51:28.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_display.c 2011-11-29 19:52:01.000000000 +0800
@@ -5858,13 +5858,13 @@ static void ironlake_write_eld(struct dr
int aud_cntrl_st2;
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;
+ hdmiw_hdmiedid = IBX_HDMIW_HDMIEDID_A;
+ aud_cntl_st = IBX_AUD_CNTL_ST_A;
+ aud_cntrl_st2 = IBX_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;
+ hdmiw_hdmiedid = CPT_HDMIW_HDMIEDID_A;
+ aud_cntl_st = CPT_AUD_CNTL_ST_A;
+ aud_cntrl_st2 = CPT_AUD_CNTRL_ST2;
}
i = to_intel_crtc(crtc)->pipe;
@@ -5878,12 +5878,12 @@ static void ironlake_write_eld(struct dr
if (!i) {
DRM_DEBUG_DRIVER("Audio directed to unknown port\n");
/* operate blindly on all ports */
- eldv = GEN5_ELD_VALIDB;
- eldv |= GEN5_ELD_VALIDB << 4;
- eldv |= GEN5_ELD_VALIDB << 8;
+ eldv = IBX_ELD_VALIDB;
+ eldv |= IBX_ELD_VALIDB << 4;
+ eldv |= IBX_ELD_VALIDB << 8;
} else {
DRM_DEBUG_DRIVER("ELD on port %c\n", 'A' + i);
- eldv = GEN5_ELD_VALIDB << ((i - 1) * 4);
+ eldv = IBX_ELD_VALIDB << ((i - 1) * 4);
}
i = I915_READ(aud_cntrl_st2);
@@ -5899,7 +5899,7 @@ static void ironlake_write_eld(struct dr
}
i = I915_READ(aud_cntl_st);
- i &= ~GEN5_ELD_ADDRESS;
+ i &= ~IBX_ELD_ADDRESS;
I915_WRITE(aud_cntl_st, i);
len = min_t(uint8_t, eld[2], 21); /* 84 bytes of hw ELD buffer */
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/5] drm/i915: dont trigger hotplug events on unchanged ELD
2011-12-09 12:42 ` Wu Fengguang
@ 2011-12-09 12:42 ` Wu Fengguang
-1 siblings, 0 replies; 14+ messages in thread
From: Wu Fengguang @ 2011-12-09 12:42 UTC (permalink / raw)
To: Keith Packard
Cc: Takashi Iwai, Wu Fengguang, Sander Jansen, Christopher White,
intel-gfx@lists.freedesktop.org, Pierre-louis Bossart,
Zhenyu Wang, Jeremy Bush, LKML
[-- Attachment #1: no-extra-eld-passing --]
[-- Type: text/plain, Size: 2609 bytes --]
The ELD may or may not change when switching the video mode.
If unchanged, don't trigger hot plug events to HDMI audio driver.
This avoids disturbing the user with repeated printks.
Reported-by: Nick Bowler <nbowler@elliptictech.com>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 51 ++++++++++++++++++++++---
1 file changed, 46 insertions(+), 5 deletions(-)
--- linux.orig/drivers/gpu/drm/i915/intel_display.c 2011-11-24 08:25:26.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_display.c 2011-11-24 08:25:27.000000000 +0800
@@ -5811,6 +5811,35 @@ static int intel_crtc_mode_set(struct dr
return ret;
}
+static bool intel_eld_uptodate(struct drm_connector *connector,
+ int reg_eldv, uint32_t bits_eldv,
+ int reg_elda, uint32_t bits_elda,
+ int reg_edid)
+{
+ struct drm_i915_private *dev_priv = connector->dev->dev_private;
+ uint8_t *eld = connector->eld;
+ uint32_t i;
+
+ i = I915_READ(reg_eldv);
+ i &= bits_eldv;
+
+ if (!eld[0])
+ return !i;
+
+ if (!i)
+ return false;
+
+ i = I915_READ(reg_elda);
+ i &= ~bits_elda;
+ I915_WRITE(reg_elda, i);
+
+ for (i = 0; i < eld[2]; i++)
+ if (I915_READ(reg_edid) != *((uint32_t *)eld + i))
+ return false;
+
+ return true;
+}
+
static void g4x_write_eld(struct drm_connector *connector,
struct drm_crtc *crtc)
{
@@ -5827,6 +5856,12 @@ static void g4x_write_eld(struct drm_con
else
eldv = G4X_ELDV_DEVCTG;
+ if (intel_eld_uptodate(connector,
+ G4X_AUD_CNTL_ST, eldv,
+ G4X_AUD_CNTL_ST, G4X_ELD_ADDR,
+ G4X_HDMIW_HDMIEDID))
+ return;
+
i = I915_READ(G4X_AUD_CNTL_ST);
i &= ~(eldv | G4X_ELD_ADDR);
len = (i >> 9) & 0x1f; /* ELD buffer size */
@@ -5886,6 +5921,17 @@ static void ironlake_write_eld(struct dr
eldv = IBX_ELD_VALIDB << ((i - 1) * 4);
}
+ if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {
+ DRM_DEBUG_DRIVER("ELD: DisplayPort detected\n");
+ eld[5] |= (1 << 2); /* Conn_Type, 0x1 = DisplayPort */
+ }
+
+ if (intel_eld_uptodate(connector,
+ aud_cntrl_st2, eldv,
+ aud_cntl_st, IBX_ELD_ADDRESS,
+ hdmiw_hdmiedid))
+ return;
+
i = I915_READ(aud_cntrl_st2);
i &= ~eldv;
I915_WRITE(aud_cntrl_st2, i);
@@ -5893,11 +5939,6 @@ static void ironlake_write_eld(struct dr
if (!eld[0])
return;
- if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {
- DRM_DEBUG_DRIVER("ELD: DisplayPort detected\n");
- eld[5] |= (1 << 2); /* Conn_Type, 0x1 = DisplayPort */
- }
-
i = I915_READ(aud_cntl_st);
i &= ~IBX_ELD_ADDRESS;
I915_WRITE(aud_cntl_st, i);
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 3/5] drm/i915: dont trigger hotplug events on unchanged ELD
@ 2011-12-09 12:42 ` Wu Fengguang
0 siblings, 0 replies; 14+ messages in thread
From: Wu Fengguang @ 2011-12-09 12:42 UTC (permalink / raw)
To: Keith Packard
Cc: Takashi Iwai, Wu Fengguang, Sander Jansen, Christopher White,
intel-gfx@lists.freedesktop.org, Pierre-louis Bossart ,
Zhenyu Wang, Jeremy Bush, LKML
[-- Attachment #1: no-extra-eld-passing --]
[-- Type: text/plain, Size: 2611 bytes --]
The ELD may or may not change when switching the video mode.
If unchanged, don't trigger hot plug events to HDMI audio driver.
This avoids disturbing the user with repeated printks.
Reported-by: Nick Bowler <nbowler@elliptictech.com>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 51 ++++++++++++++++++++++---
1 file changed, 46 insertions(+), 5 deletions(-)
--- linux.orig/drivers/gpu/drm/i915/intel_display.c 2011-11-24 08:25:26.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_display.c 2011-11-24 08:25:27.000000000 +0800
@@ -5811,6 +5811,35 @@ static int intel_crtc_mode_set(struct dr
return ret;
}
+static bool intel_eld_uptodate(struct drm_connector *connector,
+ int reg_eldv, uint32_t bits_eldv,
+ int reg_elda, uint32_t bits_elda,
+ int reg_edid)
+{
+ struct drm_i915_private *dev_priv = connector->dev->dev_private;
+ uint8_t *eld = connector->eld;
+ uint32_t i;
+
+ i = I915_READ(reg_eldv);
+ i &= bits_eldv;
+
+ if (!eld[0])
+ return !i;
+
+ if (!i)
+ return false;
+
+ i = I915_READ(reg_elda);
+ i &= ~bits_elda;
+ I915_WRITE(reg_elda, i);
+
+ for (i = 0; i < eld[2]; i++)
+ if (I915_READ(reg_edid) != *((uint32_t *)eld + i))
+ return false;
+
+ return true;
+}
+
static void g4x_write_eld(struct drm_connector *connector,
struct drm_crtc *crtc)
{
@@ -5827,6 +5856,12 @@ static void g4x_write_eld(struct drm_con
else
eldv = G4X_ELDV_DEVCTG;
+ if (intel_eld_uptodate(connector,
+ G4X_AUD_CNTL_ST, eldv,
+ G4X_AUD_CNTL_ST, G4X_ELD_ADDR,
+ G4X_HDMIW_HDMIEDID))
+ return;
+
i = I915_READ(G4X_AUD_CNTL_ST);
i &= ~(eldv | G4X_ELD_ADDR);
len = (i >> 9) & 0x1f; /* ELD buffer size */
@@ -5886,6 +5921,17 @@ static void ironlake_write_eld(struct dr
eldv = IBX_ELD_VALIDB << ((i - 1) * 4);
}
+ if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {
+ DRM_DEBUG_DRIVER("ELD: DisplayPort detected\n");
+ eld[5] |= (1 << 2); /* Conn_Type, 0x1 = DisplayPort */
+ }
+
+ if (intel_eld_uptodate(connector,
+ aud_cntrl_st2, eldv,
+ aud_cntl_st, IBX_ELD_ADDRESS,
+ hdmiw_hdmiedid))
+ return;
+
i = I915_READ(aud_cntrl_st2);
i &= ~eldv;
I915_WRITE(aud_cntrl_st2, i);
@@ -5893,11 +5939,6 @@ static void ironlake_write_eld(struct dr
if (!eld[0])
return;
- if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {
- DRM_DEBUG_DRIVER("ELD: DisplayPort detected\n");
- eld[5] |= (1 << 2); /* Conn_Type, 0x1 = DisplayPort */
- }
-
i = I915_READ(aud_cntl_st);
i &= ~IBX_ELD_ADDRESS;
I915_WRITE(aud_cntl_st, i);
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 4/5] drm/i915: HDMI hot remove notification to audio driver
2011-12-09 12:42 ` Wu Fengguang
@ 2011-12-09 12:42 ` Wu Fengguang
-1 siblings, 0 replies; 14+ messages in thread
From: Wu Fengguang @ 2011-12-09 12:42 UTC (permalink / raw)
To: Keith Packard
Cc: Takashi Iwai, Wang Zhenyu, Wu Fengguang, Sander Jansen,
Christopher White, intel-gfx@lists.freedesktop.org,
Pierre-louis Bossart, Jeremy Bush, LKML
[-- Attachment #1: eld-hot-disable --]
[-- Type: text/plain, Size: 1294 bytes --]
On HDMI monitor hot remove, clear SDVO_AUDIO_ENABLE accordingly, so that
the audio driver will receive hot plug events and take action to refresh
its device state and ELD contents.
The cleared SDVO_AUDIO_ENABLE bit needs to be restored to prevent losing
HDMI audio after DPMS on.
CC: Wang Zhenyu <zhenyu.z.wang@intel.com>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
drivers/gpu/drm/i915/intel_dp.c | 4 +++-
drivers/gpu/drm/i915/intel_hdmi.c | 8 ++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
--- linux.orig/drivers/gpu/drm/i915/intel_hdmi.c 2011-11-24 17:11:38.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_hdmi.c 2011-11-24 17:15:03.000000000 +0800
@@ -269,6 +269,10 @@ static void intel_hdmi_dpms(struct drm_e
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
u32 temp;
+ u32 enable_bits = SDVO_ENABLE;
+
+ if (intel_hdmi->has_audio)
+ enable_bits |= SDVO_AUDIO_ENABLE;
temp = I915_READ(intel_hdmi->sdvox_reg);
@@ -281,9 +285,9 @@ static void intel_hdmi_dpms(struct drm_e
}
if (mode != DRM_MODE_DPMS_ON) {
- temp &= ~SDVO_ENABLE;
+ temp &= ~enable_bits;
} else {
- temp |= SDVO_ENABLE;
+ temp |= enable_bits;
}
I915_WRITE(intel_hdmi->sdvox_reg, temp);
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 4/5] drm/i915: HDMI hot remove notification to audio driver
@ 2011-12-09 12:42 ` Wu Fengguang
0 siblings, 0 replies; 14+ messages in thread
From: Wu Fengguang @ 2011-12-09 12:42 UTC (permalink / raw)
To: Keith Packard
Cc: Takashi Iwai, Wang Zhenyu, Wu Fengguang, Sander Jansen,
Christopher White, intel-gfx@lists.freedesktop.org,
Pierre-louis Bossart , Jeremy Bush, LKML
[-- Attachment #1: eld-hot-disable --]
[-- Type: text/plain, Size: 1296 bytes --]
On HDMI monitor hot remove, clear SDVO_AUDIO_ENABLE accordingly, so that
the audio driver will receive hot plug events and take action to refresh
its device state and ELD contents.
The cleared SDVO_AUDIO_ENABLE bit needs to be restored to prevent losing
HDMI audio after DPMS on.
CC: Wang Zhenyu <zhenyu.z.wang@intel.com>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
drivers/gpu/drm/i915/intel_dp.c | 4 +++-
drivers/gpu/drm/i915/intel_hdmi.c | 8 ++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
--- linux.orig/drivers/gpu/drm/i915/intel_hdmi.c 2011-11-24 17:11:38.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_hdmi.c 2011-11-24 17:15:03.000000000 +0800
@@ -269,6 +269,10 @@ static void intel_hdmi_dpms(struct drm_e
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
u32 temp;
+ u32 enable_bits = SDVO_ENABLE;
+
+ if (intel_hdmi->has_audio)
+ enable_bits |= SDVO_AUDIO_ENABLE;
temp = I915_READ(intel_hdmi->sdvox_reg);
@@ -281,9 +285,9 @@ static void intel_hdmi_dpms(struct drm_e
}
if (mode != DRM_MODE_DPMS_ON) {
- temp &= ~SDVO_ENABLE;
+ temp &= ~enable_bits;
} else {
- temp |= SDVO_ENABLE;
+ temp |= enable_bits;
}
I915_WRITE(intel_hdmi->sdvox_reg, temp);
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 5/5] drm/i915: DisplayPort hot remove notification to audio driver
2011-12-09 12:42 ` Wu Fengguang
@ 2011-12-09 12:42 ` Wu Fengguang
-1 siblings, 0 replies; 14+ messages in thread
From: Wu Fengguang @ 2011-12-09 12:42 UTC (permalink / raw)
To: Keith Packard
Cc: Takashi Iwai, Wu Fengguang, Sander Jansen, Christopher White,
intel-gfx@lists.freedesktop.org, Pierre-louis Bossart,
Zhenyu Wang, Jeremy Bush, LKML
[-- Attachment #1: dp-eld-hot-disable --]
[-- Type: text/plain, Size: 958 bytes --]
On DP monitor hot remove, clear DP_AUDIO_OUTPUT_ENABLE accordingly,
so that the audio driver will receive hot plug events and take action
to refresh its device state and ELD contents.
Note that the DP_AUDIO_OUTPUT_ENABLE bit may be enabled or disabled
only when the link training is complete and set to "Normal".
Tested OK for both hot plug/remove and DPMS on/off.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
drivers/gpu/drm/i915/intel_dp.c | 1 +
1 file changed, 1 insertion(+)
--- linux.orig/drivers/gpu/drm/i915/intel_dp.c 2011-12-09 16:51:21.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_dp.c 2011-12-09 16:59:45.000000000 +0800
@@ -1771,6 +1771,7 @@ intel_dp_link_down(struct intel_dp *inte
intel_wait_for_vblank(dev, to_intel_crtc(crtc)->pipe);
}
+ DP &= ~DP_AUDIO_OUTPUT_ENABLE;
I915_WRITE(intel_dp->output_reg, DP & ~DP_PORT_EN);
POSTING_READ(intel_dp->output_reg);
msleep(intel_dp->panel_power_down_delay);
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 5/5] drm/i915: DisplayPort hot remove notification to audio driver
@ 2011-12-09 12:42 ` Wu Fengguang
0 siblings, 0 replies; 14+ messages in thread
From: Wu Fengguang @ 2011-12-09 12:42 UTC (permalink / raw)
To: Keith Packard
Cc: Takashi Iwai, Wu Fengguang, Sander Jansen, Christopher White,
intel-gfx@lists.freedesktop.org, Pierre-louis Bossart ,
Zhenyu Wang, Jeremy Bush, LKML
[-- Attachment #1: dp-eld-hot-disable --]
[-- Type: text/plain, Size: 960 bytes --]
On DP monitor hot remove, clear DP_AUDIO_OUTPUT_ENABLE accordingly,
so that the audio driver will receive hot plug events and take action
to refresh its device state and ELD contents.
Note that the DP_AUDIO_OUTPUT_ENABLE bit may be enabled or disabled
only when the link training is complete and set to "Normal".
Tested OK for both hot plug/remove and DPMS on/off.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
drivers/gpu/drm/i915/intel_dp.c | 1 +
1 file changed, 1 insertion(+)
--- linux.orig/drivers/gpu/drm/i915/intel_dp.c 2011-12-09 16:51:21.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_dp.c 2011-12-09 16:59:45.000000000 +0800
@@ -1771,6 +1771,7 @@ intel_dp_link_down(struct intel_dp *inte
intel_wait_for_vblank(dev, to_intel_crtc(crtc)->pipe);
}
+ DP &= ~DP_AUDIO_OUTPUT_ENABLE;
I915_WRITE(intel_dp->output_reg, DP & ~DP_PORT_EN);
POSTING_READ(intel_dp->output_reg);
msleep(intel_dp->panel_power_down_delay);
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/5] Intel HDMI ELD fixes v2
2011-12-09 12:42 ` Wu Fengguang
@ 2011-12-09 13:26 ` Takashi Iwai
-1 siblings, 0 replies; 14+ messages in thread
From: Takashi Iwai @ 2011-12-09 13:26 UTC (permalink / raw)
To: Wu Fengguang
Cc: Zhenyu Wang, intel-gfx@lists.freedesktop.org, LKML, Jeremy Bush,
Christopher White, Pierre-louis Bossart
At Fri, 09 Dec 2011 20:42:16 +0800,
Wu Fengguang wrote:
>
> Keith,
>
> The complete set of fixes for passing HDMI/DP ELD to audio driver.
>
> [PATCH 1/5] drm/i915: fix ELD writing for SandyBridge
> [PATCH 2/5] drm/i915: rename audio ELD registers
> [PATCH 3/5] drm/i915: dont trigger hotplug events on unchanged ELD
> [PATCH 4/5] drm/i915: HDMI hot remove notification to audio driver
> [PATCH 5/5] drm/i915: DisplayPort hot remove notification to audio driver
>
> drivers/gpu/drm/i915/i915_reg.h | 22 +++----
> drivers/gpu/drm/i915/intel_display.c | 75 +++++++++++++++++++------
> drivers/gpu/drm/i915/intel_dp.c | 1
> drivers/gpu/drm/i915/intel_hdmi.c | 8 ++
> 4 files changed, 76 insertions(+), 30 deletions(-)
Thanks. Feel free to add my ack to all these.
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/5] Intel HDMI ELD fixes v2
@ 2011-12-09 13:26 ` Takashi Iwai
0 siblings, 0 replies; 14+ messages in thread
From: Takashi Iwai @ 2011-12-09 13:26 UTC (permalink / raw)
To: Wu Fengguang
Cc: Keith Packard, Sander Jansen, Christopher White,
intel-gfx@lists.freedesktop.org, Pierre-louis Bossart ,
Zhenyu Wang, Jeremy Bush, LKML
At Fri, 09 Dec 2011 20:42:16 +0800,
Wu Fengguang wrote:
>
> Keith,
>
> The complete set of fixes for passing HDMI/DP ELD to audio driver.
>
> [PATCH 1/5] drm/i915: fix ELD writing for SandyBridge
> [PATCH 2/5] drm/i915: rename audio ELD registers
> [PATCH 3/5] drm/i915: dont trigger hotplug events on unchanged ELD
> [PATCH 4/5] drm/i915: HDMI hot remove notification to audio driver
> [PATCH 5/5] drm/i915: DisplayPort hot remove notification to audio driver
>
> drivers/gpu/drm/i915/i915_reg.h | 22 +++----
> drivers/gpu/drm/i915/intel_display.c | 75 +++++++++++++++++++------
> drivers/gpu/drm/i915/intel_dp.c | 1
> drivers/gpu/drm/i915/intel_hdmi.c | 8 ++
> 4 files changed, 76 insertions(+), 30 deletions(-)
Thanks. Feel free to add my ack to all these.
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi
^ permalink raw reply [flat|nested] 14+ messages in thread