| Message ID | 20171129164303.18793-1-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
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
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;