public inbox for drm-ai-reviews@public-inbox.freedesktop.org
 help / color / mirror / Atom feed
From: Paul Menzel <pmenzel@molgen.mpg.de>
To: Jani Nikula <jani.nikula@linux.intel.com>,
	Rodrigo Vivi <rodrigo.vivi@intel.com>,
	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
	Tvrtko Ursulin <tursulin@ursulin.net>,
	David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>
Cc: Paul Menzel <pmenzel@molgen.mpg.de>,
	intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org,
	dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH] drm/i915/audio: skip ELD query for force-off connectors
Date: Tue, 26 May 2026 18:19:24 +0200	[thread overview]
Message-ID: <20260526161925.17041-1-pmenzel@molgen.mpg.de> (raw)

When a connector is forced off via the `video=` command-line parameter
(`video=<connector>:d`), `intel_audio_component_get_eld()` returns -EINVAL
for that port because `find_audio_state()` finds no active encoder.  The
audio driver interprets this as an error rather than a clean “no monitor
present” reply, and, on the Dell XPS 13 9360, at `drm.debug=0x04` the
repeated calls generate the log below:

    i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port B
    i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port B
    i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port B
    i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port C
    i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port C
    i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port C
    i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port D
    i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port D
    i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port D

Add `intel_audio_connector_is_forced_off()` which scans the connector list
to check whether any connector on the given port has
`force == DRM_FORCE_OFF`. When the caller finds no audio state and the
port’s connector is forced off, report `*enabled = false` and return 0 so
the audio driver sees a clean “not connected” answer and stops querying
that port.

With `video=DP-2:d drm.debug=0x04` the unneeded calls are gone (port C):

    [   90.458772] i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port B
    [   90.459649] i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port B
    [   90.460547] i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port B
    [   90.461581] i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port D
    [   90.462509] i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port D
    [   90.463385] i915 0000:00:02.0: [drm:intel_audio_component_get_eld [i915]] Not valid for port D

Assisted-by: Claude Sonnet 4.6
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
 drivers/gpu/drm/i915/display/intel_audio.c | 29 +++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
index 081627e0d917..7864b9a485d5 100644
--- a/drivers/gpu/drm/i915/display/intel_audio.c
+++ b/drivers/gpu/drm/i915/display/intel_audio.c
@@ -36,6 +36,7 @@
 #include "intel_cdclk.h"
 #include "intel_crtc.h"
 #include "intel_de.h"
+#include "intel_display.h"
 #include "intel_display_types.h"
 #include "intel_display_wa.h"
 #include "intel_lpe_audio.h"
@@ -1211,6 +1212,28 @@ static int intel_audio_component_sync_audio_rate(struct device *kdev, int port,
 	return err;
 }
 
+static bool intel_audio_connector_is_forced_off(struct intel_display *display,
+						int port)
+{
+	struct drm_connector_list_iter conn_iter;
+	struct intel_connector *connector;
+	bool forced_off = false;
+
+	drm_connector_list_iter_begin(display->drm, &conn_iter);
+	for_each_intel_connector_iter(connector, &conn_iter) {
+		struct intel_encoder *encoder = intel_attached_encoder(connector);
+
+		if (encoder && encoder->port == port &&
+		    connector->base.force == DRM_FORCE_OFF) {
+			forced_off = true;
+			break;
+		}
+	}
+	drm_connector_list_iter_end(&conn_iter);
+
+	return forced_off;
+}
+
 static int intel_audio_component_get_eld(struct device *kdev, int port,
 					 int cpu_transcoder, bool *enabled,
 					 unsigned char *buf, int max_bytes)
@@ -1223,9 +1246,13 @@ static int intel_audio_component_get_eld(struct device *kdev, int port,
 
 	audio_state = find_audio_state(display, port, cpu_transcoder);
 	if (!audio_state) {
+		mutex_unlock(&display->audio.mutex);
+		if (intel_audio_connector_is_forced_off(display, port)) {
+			*enabled = false;
+			return 0;
+		}
 		drm_dbg_kms(display->drm, "Not valid for port %c\n",
 			    port_name(port));
-		mutex_unlock(&display->audio.mutex);
 		return -EINVAL;
 	}
 
-- 
2.53.0


             reply	other threads:[~2026-05-26 16:20 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-26 16:19 Paul Menzel [this message]
2026-05-27  4:32 ` Claude review: drm/i915/audio: skip ELD query for force-off connectors Claude Code Review Bot
2026-05-27  4:32 ` Claude Code Review Bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260526161925.17041-1-pmenzel@molgen.mpg.de \
    --to=pmenzel@molgen.mpg.de \
    --cc=airlied@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=joonas.lahtinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rodrigo.vivi@intel.com \
    --cc=simona@ffwll.ch \
    --cc=tursulin@ursulin.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox