drm/i915/audio: Don't enable audio with bogus ELD
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 24 Jan 2023 14:46:20 +0000 (16:46 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 25 Jan 2023 10:23:47 +0000 (12:23 +0200)
Currently we just print a debug message if the ELD is bogus.
Maybe we should just not enable audio at all in that case?

Cc: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Cc: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230124144628.4649-6-ville.syrjala@linux.intel.com
drivers/gpu/drm/i915/display/intel_audio.c

index 326e937..5123bab 100644 (file)
@@ -757,10 +757,12 @@ bool intel_audio_compute_config(struct intel_encoder *encoder,
        const struct drm_display_mode *adjusted_mode =
                &crtc_state->hw.adjusted_mode;
 
-       if (!connector->eld[0])
+       if (!connector->eld[0]) {
                drm_dbg_kms(&i915->drm,
                            "Bogus ELD on [CONNECTOR:%d:%s]\n",
                            connector->base.id, connector->name);
+               return false;
+       }
 
        BUILD_BUG_ON(sizeof(crtc_state->eld) != sizeof(connector->eld));
        memcpy(crtc_state->eld, connector->eld, sizeof(crtc_state->eld));