Commit abf4b8ed authored Apr 30, 2019 by Ville Syrjälä

drm/i915: Don't skip audio enable if ELD is bogus

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@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190430142901.7302-1-ville.syrjala@linux.intel.com


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

parent 117aca43

drivers/gpu/drm/i915/intel_audio.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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,