* [PATCH 1/3] drm/i915: Disable DP audio for g4x
@ 2017-11-29 16:43 Ville Syrjala
2017-11-29 16:43 ` [PATCH 2/3] drm/i915: Don't add the "force audio" property to DP connectors that don't support audio Ville Syrjala
` (6 more replies)
0 siblings, 7 replies; 12+ messages in thread
From: Ville Syrjala @ 2017-11-29 16:43 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Apparently g4x doesn't support audio over DP. Bspec lists the
bit as "Reserved for Audio Output Enable", and empirical evidence
tells us that the bit won't stick. So stop trying to enable DP
audio on g4x.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_dp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 957735c0b4c6..0e1a20e625e4 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1643,7 +1643,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
pipe_config->has_pch_encoder = true;
pipe_config->has_drrs = false;
- if (port == PORT_A)
+ if (IS_G4X(dev_priv) || port == PORT_A)
pipe_config->has_audio = false;
else if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
pipe_config->has_audio = intel_dp->has_audio;
--
2.13.6
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/3] drm/i915: Don't add the "force audio" property to DP connectors that don't support audio
2017-11-29 16:43 [PATCH 1/3] drm/i915: Disable DP audio for g4x Ville Syrjala
@ 2017-11-29 16:43 ` Ville Syrjala
2017-11-29 23:26 ` Rodrigo Vivi
2017-11-29 16:43 ` [PATCH 3/3] drm/i915: Fix has_audio readout for DDI A Ville Syrjala
` (5 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Ville Syrjala @ 2017-11-29 16:43 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
No point in adding the "force audio" property to DP connectors
that don't support audio (g4x or port A).
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_dp.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 0e1a20e625e4..f8ead29e3c81 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5180,8 +5180,11 @@ static void
intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connector)
{
struct drm_i915_private *dev_priv = to_i915(connector->dev);
+ enum port port = dp_to_dig_port(intel_dp)->base.port;
+
+ if (!IS_G4X(dev_priv) && port != PORT_A)
+ intel_attach_force_audio_property(connector);
- intel_attach_force_audio_property(connector);
intel_attach_broadcast_rgb_property(connector);
if (intel_dp_is_edp(intel_dp)) {
--
2.13.6
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/3] drm/i915: Fix has_audio readout for DDI A
2017-11-29 16:43 [PATCH 1/3] drm/i915: Disable DP audio for g4x Ville Syrjala
2017-11-29 16:43 ` [PATCH 2/3] drm/i915: Don't add the "force audio" property to DP connectors that don't support audio Ville Syrjala
@ 2017-11-29 16:43 ` Ville Syrjala
2017-11-29 23:23 ` Rodrigo Vivi
2017-11-29 23:22 ` [PATCH 1/3] drm/i915: Disable DP audio for g4x Rodrigo Vivi
` (4 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Ville Syrjala @ 2017-11-29 16:43 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Transcoder EDP does not support audio. Let's not try to
read the state of the audio enable bit HSW_AUD_PIN_ELD_CP_VLD
based on the pipe when using transcoder EDP.
While at it make the function static and flatten it.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_ddi.c | 20 ++++++++++----------
drivers/gpu/drm/i915/intel_drv.h | 2 --
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index eff3b51872eb..48ba9b7fdc78 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -2513,17 +2513,17 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)
udelay(600);
}
-bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
- struct intel_crtc *intel_crtc)
+static bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
+ enum transcoder cpu_transcoder)
{
- u32 temp;
+ if (cpu_transcoder == TRANSCODER_EDP)
+ return false;
- if (intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {
- temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
- if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))
- return true;
- }
- return false;
+ if (!intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO))
+ return false;
+
+ return I915_READ(HSW_AUD_PIN_ELD_CP_VLD) &
+ AUDIO_OUTPUT_ENABLE(cpu_transcoder);
}
void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv,
@@ -2616,7 +2616,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
}
pipe_config->has_audio =
- intel_ddi_is_audio_enabled(dev_priv, intel_crtc);
+ intel_ddi_is_audio_enabled(dev_priv, cpu_transcoder);
if (encoder->type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp.bpp &&
pipe_config->pipe_bpp > dev_priv->vbt.edp.bpp) {
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index c679df99d530..c55fa245cd8c 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1288,8 +1288,6 @@ intel_ddi_get_crtc_new_encoder(struct intel_crtc_state *crtc_state);
void intel_ddi_set_pipe_settings(const struct intel_crtc_state *crtc_state);
void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp);
bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
-bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
- struct intel_crtc *intel_crtc);
void intel_ddi_get_config(struct intel_encoder *encoder,
struct intel_crtc_state *pipe_config);
--
2.13.6
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 1/3] drm/i915: Disable DP audio for g4x
2017-11-29 16:43 [PATCH 1/3] drm/i915: Disable DP audio for g4x Ville Syrjala
2017-11-29 16:43 ` [PATCH 2/3] drm/i915: Don't add the "force audio" property to DP connectors that don't support audio Ville Syrjala
2017-11-29 16:43 ` [PATCH 3/3] drm/i915: Fix has_audio readout for DDI A Ville Syrjala
@ 2017-11-29 23:22 ` Rodrigo Vivi
2017-12-01 15:11 ` Ville Syrjälä
2017-11-30 9:10 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] " Patchwork
` (3 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Rodrigo Vivi @ 2017-11-29 23:22 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
On Wed, Nov 29, 2017 at 04:43:01PM +0000, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Apparently g4x doesn't support audio over DP. Bspec lists the
> bit as "Reserved for Audio Output Enable", and empirical evidence
> tells us that the bit won't stick. So stop trying to enable DP
> audio on g4x.
Based on the display controller specified at
https://01.org/sites/default/files/documentation/g45_vol_3_register_0_0_0.pdf
you are right...
If I'm following the right spec feel free to use:
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
otherwise, please point me to the right place ;)
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 957735c0b4c6..0e1a20e625e4 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1643,7 +1643,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
> pipe_config->has_pch_encoder = true;
>
> pipe_config->has_drrs = false;
> - if (port == PORT_A)
> + if (IS_G4X(dev_priv) || port == PORT_A)
> pipe_config->has_audio = false;
> else if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
> pipe_config->has_audio = intel_dp->has_audio;
> --
> 2.13.6
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 3/3] drm/i915: Fix has_audio readout for DDI A
2017-11-29 16:43 ` [PATCH 3/3] drm/i915: Fix has_audio readout for DDI A Ville Syrjala
@ 2017-11-29 23:23 ` Rodrigo Vivi
0 siblings, 0 replies; 12+ messages in thread
From: Rodrigo Vivi @ 2017-11-29 23:23 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
On Wed, Nov 29, 2017 at 04:43:03PM +0000, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Transcoder EDP does not support audio. Let's not try to
> read the state of the audio enable bit HSW_AUD_PIN_ELD_CP_VLD
> based on the pipe when using transcoder EDP.
>
> While at it make the function static and flatten it.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 20 ++++++++++----------
> drivers/gpu/drm/i915/intel_drv.h | 2 --
> 2 files changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index eff3b51872eb..48ba9b7fdc78 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -2513,17 +2513,17 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)
> udelay(600);
> }
>
> -bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
> - struct intel_crtc *intel_crtc)
> +static bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
> + enum transcoder cpu_transcoder)
> {
> - u32 temp;
> + if (cpu_transcoder == TRANSCODER_EDP)
> + return false;
>
> - if (intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {
> - temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
> - if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))
> - return true;
> - }
> - return false;
> + if (!intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO))
> + return false;
> +
> + return I915_READ(HSW_AUD_PIN_ELD_CP_VLD) &
> + AUDIO_OUTPUT_ENABLE(cpu_transcoder);
> }
>
> void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv,
> @@ -2616,7 +2616,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
> }
>
> pipe_config->has_audio =
> - intel_ddi_is_audio_enabled(dev_priv, intel_crtc);
> + intel_ddi_is_audio_enabled(dev_priv, cpu_transcoder);
>
> if (encoder->type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp.bpp &&
> pipe_config->pipe_bpp > dev_priv->vbt.edp.bpp) {
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index c679df99d530..c55fa245cd8c 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1288,8 +1288,6 @@ intel_ddi_get_crtc_new_encoder(struct intel_crtc_state *crtc_state);
> void intel_ddi_set_pipe_settings(const struct intel_crtc_state *crtc_state);
> void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp);
> bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
> -bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
> - struct intel_crtc *intel_crtc);
> void intel_ddi_get_config(struct intel_encoder *encoder,
> struct intel_crtc_state *pipe_config);
>
> --
> 2.13.6
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/3] drm/i915: Don't add the "force audio" property to DP connectors that don't support audio
2017-11-29 16:43 ` [PATCH 2/3] drm/i915: Don't add the "force audio" property to DP connectors that don't support audio Ville Syrjala
@ 2017-11-29 23:26 ` Rodrigo Vivi
2017-11-30 8:16 ` Daniel Vetter
0 siblings, 1 reply; 12+ messages in thread
From: Rodrigo Vivi @ 2017-11-29 23:26 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
On Wed, Nov 29, 2017 at 04:43:02PM +0000, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> No point in adding the "force audio" property to DP connectors
> that don't support audio (g4x or port A).
It makes sense... but the lack of the property there couldn't
break any existent user space?
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 0e1a20e625e4..f8ead29e3c81 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -5180,8 +5180,11 @@ static void
> intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connector)
> {
> struct drm_i915_private *dev_priv = to_i915(connector->dev);
> + enum port port = dp_to_dig_port(intel_dp)->base.port;
> +
> + if (!IS_G4X(dev_priv) && port != PORT_A)
> + intel_attach_force_audio_property(connector);
>
> - intel_attach_force_audio_property(connector);
> intel_attach_broadcast_rgb_property(connector);
>
> if (intel_dp_is_edp(intel_dp)) {
> --
> 2.13.6
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/3] drm/i915: Don't add the "force audio" property to DP connectors that don't support audio
2017-11-29 23:26 ` Rodrigo Vivi
@ 2017-11-30 8:16 ` Daniel Vetter
0 siblings, 0 replies; 12+ messages in thread
From: Daniel Vetter @ 2017-11-30 8:16 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Wed, Nov 29, 2017 at 03:26:53PM -0800, Rodrigo Vivi wrote:
> On Wed, Nov 29, 2017 at 04:43:02PM +0000, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > No point in adding the "force audio" property to DP connectors
> > that don't support audio (g4x or port A).
>
> It makes sense... but the lack of the property there couldn't
> break any existent user space?
It's optional, other connectors don't have it. In general userspace can't
really assume any given property is there (minus the atomic ones which
every atomic driver has). Exceptions apply, but in general this works
fairly well. And if we hit an exception, we can take a closer look.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_dp.c | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> > index 0e1a20e625e4..f8ead29e3c81 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -5180,8 +5180,11 @@ static void
> > intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connector)
> > {
> > struct drm_i915_private *dev_priv = to_i915(connector->dev);
> > + enum port port = dp_to_dig_port(intel_dp)->base.port;
> > +
> > + if (!IS_G4X(dev_priv) && port != PORT_A)
> > + intel_attach_force_audio_property(connector);
> >
> > - intel_attach_force_audio_property(connector);
> > intel_attach_broadcast_rgb_property(connector);
> >
> > if (intel_dp_is_edp(intel_dp)) {
> > --
> > 2.13.6
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915: Disable DP audio for g4x
2017-11-29 16:43 [PATCH 1/3] drm/i915: Disable DP audio for g4x Ville Syrjala
` (2 preceding siblings ...)
2017-11-29 23:22 ` [PATCH 1/3] drm/i915: Disable DP audio for g4x Rodrigo Vivi
@ 2017-11-30 9:10 ` Patchwork
2017-11-30 11:40 ` ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2017-11-30 9:10 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/3] drm/i915: Disable DP audio for g4x
URL : https://patchwork.freedesktop.org/series/34638/
State : failure
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915: Disable DP audio for g4x
2017-11-29 16:43 [PATCH 1/3] drm/i915: Disable DP audio for g4x Ville Syrjala
` (3 preceding siblings ...)
2017-11-30 9:10 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] " Patchwork
@ 2017-11-30 11:40 ` Patchwork
2017-11-30 14:23 ` ✗ Fi.CI.IGT: failure " Patchwork
2017-11-30 15:11 ` ✓ Fi.CI.BAT: success " Patchwork
6 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2017-11-30 11:40 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/3] drm/i915: Disable DP audio for g4x
URL : https://patchwork.freedesktop.org/series/34638/
State : success
== Summary ==
Series 34638v1 series starting with [1/3] drm/i915: Disable DP audio for g4x
https://patchwork.freedesktop.org/api/1.0/series/34638/revisions/1/mbox/
Test gem_exec_suspend:
Subgroup basic-s3:
dmesg-warn -> PASS (fi-elk-e7500) fdo#103989
fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:437s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:441s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:384s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:510s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:282s
fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:501s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:507s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:486s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:470s
fi-elk-e7500 total:224 pass:163 dwarn:15 dfail:0 fail:0 skip:45
fi-gdg-551 total:288 pass:178 dwarn:1 dfail:0 fail:1 skip:108 time:268s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:537s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:359s
fi-hsw-4770r total:288 pass:224 dwarn:0 dfail:0 fail:0 skip:64 time:258s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:398s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:480s
fi-ivb-3770 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:447s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:489s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:527s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:478s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:534s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:585s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:442s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:544s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:570s
fi-skl-6700k total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:512s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:494s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:445s
fi-snb-2520m total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:546s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:420s
Blacklisted hosts:
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:604s
fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:491s
d6733c38a8d115689838885f30009c584d187865 drm-tip: 2017y-11m-30d-10h-58m-46s UTC integration manifest
05192742bbfc drm/i915: Fix has_audio readout for DDI A
766d557d3586 drm/i915: Don't add the "force audio" property to DP connectors that don't support audio
28cd684ddcd4 drm/i915: Disable DP audio for g4x
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7364/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* ✗ Fi.CI.IGT: failure for series starting with [1/3] drm/i915: Disable DP audio for g4x
2017-11-29 16:43 [PATCH 1/3] drm/i915: Disable DP audio for g4x Ville Syrjala
` (4 preceding siblings ...)
2017-11-30 11:40 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2017-11-30 14:23 ` Patchwork
2017-11-30 15:11 ` ✓ Fi.CI.BAT: success " Patchwork
6 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2017-11-30 14:23 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/3] drm/i915: Disable DP audio for g4x
URL : https://patchwork.freedesktop.org/series/34638/
State : failure
== Summary ==
Test kms_flip:
Subgroup rcs-wf_vblank-vs-dpms-interruptible:
pass -> DMESG-WARN (shard-hsw) fdo#102614
Subgroup vblank-vs-dpms-suspend:
pass -> INCOMPLETE (shard-snb)
Test drv_selftest:
Subgroup mock_sanitycheck:
pass -> DMESG-WARN (shard-hsw) fdo#102707
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
fail -> PASS (shard-snb) fdo#101623
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
shard-hsw total:2609 pass:1504 dwarn:3 dfail:0 fail:10 skip:1091 time:9042s
shard-snb total:2618 pass:1285 dwarn:1 dfail:0 fail:12 skip:1319 time:7772s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7364/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915: Disable DP audio for g4x
2017-11-29 16:43 [PATCH 1/3] drm/i915: Disable DP audio for g4x Ville Syrjala
` (5 preceding siblings ...)
2017-11-30 14:23 ` ✗ Fi.CI.IGT: failure " Patchwork
@ 2017-11-30 15:11 ` Patchwork
6 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2017-11-30 15:11 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/3] drm/i915: Disable DP audio for g4x
URL : https://patchwork.freedesktop.org/series/34638/
State : success
== Summary ==
Series 34638v1 series starting with [1/3] drm/i915: Disable DP audio for g4x
https://patchwork.freedesktop.org/api/1.0/series/34638/revisions/1/mbox/
Test gem_exec_reloc:
Subgroup basic-cpu-active:
fail -> PASS (fi-gdg-551) fdo#102582 +1
Test gem_exec_suspend:
Subgroup basic-s3:
dmesg-warn -> PASS (fi-elk-e7500) fdo#103989
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
fail -> PASS (fi-gdg-551) fdo#102575
fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582
fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:444s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:449s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:386s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:514s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:280s
fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:504s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:510s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:488s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:475s
fi-elk-e7500 total:224 pass:163 dwarn:15 dfail:0 fail:0 skip:45
fi-gdg-551 total:288 pass:179 dwarn:1 dfail:0 fail:0 skip:108 time:274s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:538s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:382s
fi-hsw-4770r total:288 pass:224 dwarn:0 dfail:0 fail:0 skip:64 time:259s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:392s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:480s
fi-ivb-3770 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:450s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:484s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:524s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:475s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:535s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:592s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:454s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:540s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:569s
fi-skl-6700k total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:525s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:507s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:447s
fi-snb-2520m total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:547s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:415s
Blacklisted hosts:
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:613s
fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:486s
6d6c48b9b35806aba461d2c8285db2689de9095f drm-tip: 2017y-11m-30d-12h-22m-59s UTC integration manifest
fe06427cbda5 drm/i915: Fix has_audio readout for DDI A
565c2bd84e14 drm/i915: Don't add the "force audio" property to DP connectors that don't support audio
fdc0e55858e1 drm/i915: Disable DP audio for g4x
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7371/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/3] drm/i915: Disable DP audio for g4x
2017-11-29 23:22 ` [PATCH 1/3] drm/i915: Disable DP audio for g4x Rodrigo Vivi
@ 2017-12-01 15:11 ` Ville Syrjälä
0 siblings, 0 replies; 12+ messages in thread
From: Ville Syrjälä @ 2017-12-01 15:11 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Wed, Nov 29, 2017 at 03:22:33PM -0800, Rodrigo Vivi wrote:
> On Wed, Nov 29, 2017 at 04:43:01PM +0000, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > Apparently g4x doesn't support audio over DP. Bspec lists the
> > bit as "Reserved for Audio Output Enable", and empirical evidence
> > tells us that the bit won't stick. So stop trying to enable DP
> > audio on g4x.
>
> Based on the display controller specified at
> https://01.org/sites/default/files/documentation/g45_vol_3_register_0_0_0.pdf
>
> you are right...
> If I'm following the right spec feel free to use:
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> otherwise, please point me to the right place ;)
Your doc link looks correct for this case.
Amended with
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103989
and pushed the lot to dinq. Thanks for the review.
>
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_dp.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> > index 957735c0b4c6..0e1a20e625e4 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -1643,7 +1643,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
> > pipe_config->has_pch_encoder = true;
> >
> > pipe_config->has_drrs = false;
> > - if (port == PORT_A)
> > + if (IS_G4X(dev_priv) || port == PORT_A)
> > pipe_config->has_audio = false;
> > else if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
> > pipe_config->has_audio = intel_dp->has_audio;
> > --
> > 2.13.6
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-12-01 15:11 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-29 16:43 [PATCH 1/3] drm/i915: Disable DP audio for g4x Ville Syrjala
2017-11-29 16:43 ` [PATCH 2/3] drm/i915: Don't add the "force audio" property to DP connectors that don't support audio Ville Syrjala
2017-11-29 23:26 ` Rodrigo Vivi
2017-11-30 8:16 ` Daniel Vetter
2017-11-29 16:43 ` [PATCH 3/3] drm/i915: Fix has_audio readout for DDI A Ville Syrjala
2017-11-29 23:23 ` Rodrigo Vivi
2017-11-29 23:22 ` [PATCH 1/3] drm/i915: Disable DP audio for g4x Rodrigo Vivi
2017-12-01 15:11 ` Ville Syrjälä
2017-11-30 9:10 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] " Patchwork
2017-11-30 11:40 ` ✓ Fi.CI.BAT: success " Patchwork
2017-11-30 14:23 ` ✗ Fi.CI.IGT: failure " Patchwork
2017-11-30 15:11 ` ✓ Fi.CI.BAT: success " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.