[Intel-gfx] [PATCH 1/2] drm/i915: Don't skip audio enable if ELD is bogus

[Jani Nikula]

On Tue, 30 Apr 2019, Ville Syrjala <ville.syrjala at linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> We've already committed to enabling audio when intel_audio_codec_enable()
> is called. We can't back out even if the ELD has turned sour in the
> meantime. So just spew some debug log and plow ahead. Otherwise the
> state checker gets unhappy when audio isn't enabled when it is
> expected to be.
>
> I suppose we really ought to precompute the ELD as well, but
> let's just toss in a FIXME for the future.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103841
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula at intel.com>

> ---
>  drivers/gpu/drm/i915/intel_audio.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index bca4cc025d3d..68a24dada44c 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -644,8 +644,10 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,
>  	enum port port = encoder->port;
>  	enum pipe pipe = crtc->pipe;
>  
> +	/* FIXME precompute the ELD in .compute_config() */
>  	if (!connector->eld[0])
> -		return;
> +		DRM_DEBUG_KMS("Bogus ELD on [CONNECTOR:%d:%s]\n",
> +			      connector->base.id, connector->name);
>  
>  	DRM_DEBUG_DRIVER("ELD on [CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",
>  			 connector->base.id,

-- 
Jani Nikula, Intel Open Source Graphics Center