Skip to contentSkip to conversation

drm/bridge: it6505: DP audio support + shared-DAI hw_params fix

PATCH In review Daniel Golle 2 participants 18 messages Nov 19 – Nov 20

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v9 cover drm/bridge: it6505: DP audio support + shared-DAI hw_params fix

Revive HDMI/DP audio support for the it6505, originally posted by Jiaxin Yu [1], rebased onto current -next with the review feedback
addressed: &client->dev is gone (the driver gained it6505->dev) and "#sound-dai-cells" has since been added by commit 325af1bef5b9 ("dt-bindings: display: bridge: it6505: Add #sound-dai-cells").

Patches 1-12 fix pre-existing bugs found during review of earlier versions of this series; they carry Fixes: tags and are ordered first so stable trees can pick them.

Patch 13 wires up the it6505 audio helpers via hdmi_codec_ops, unblocking the mt8186-mt6366 sound card which references it6505 as the I2S3 codec. Without it the whole sound card fails to probe, so speakers, microphone and headset jack don't work either. Patch 14 makes hw_params succeed with no display attached, needed when the I2S bus is shared with another codec as on MT8186 "steelix" Chromebooks, where the speaker path must keep working regardless of the it6505 link state.

Earlier revisions were tested on a MT8186 (google,steelix) Chromebook:
the sound card comes up, speakers, microphone and headset jack work. Angelo tested v6 on the same machine [2]. I no longer have access to the hardware, so the changes since v6 are build-tested only (clang, W=1, every patch of the series). HDMI/DP audio output itself could not be tested for lack of a suitable adapter cable. The error paths fixed by patches 5-12 (failing register reads, divisions by zero, malformed DT properties) were not triggered on hardware.

Angelo, could you give v9 another spin on your steelix? The patches that changed since v6 (2, 4, 6, 8 and 13) don't carry your tags.

Tool use:

All patches of this series were drafted with the help of Claude Code (Anthropic). I did not keep track of which Claude models were used for v1-v8; the v9 changes were made with Claude Opus 5.5.

* Patch 13 is based on Jiaxin Yu's v3 [1]. Claude Code rebased it onto current -next and wrote the audio_lock and mute state serialisation added since v3 of this series in response to review.

* Patches 1-12 and 14 address findings of the Sashiko AI review of earlier revisions, most of them pre-existing defects. For each revision I handed the complete Sashiko review to Claude Code, which assessed the findings, wrote fixes for the valid ones and pointed out those that were out of scope or invalid (see the changelog below). I reviewed the resulting changes.

* Commit messages and cover letters were partially drafted by Claude Code and edited by me.

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/
---
v9:
* describe tool use in the cover letter instead of Assisted-by:
trailers, as Documentation/process/generated-content.rst now asks
* patch 4: track the DP AUX registration in a flag, serialised by a new mutex, instead of relying on drm_dp_aux_unregister() doing nothing for an unregistered adapter (Luca Ceresoli)
* patch 6: read and acknowledge the interrupt status registers with single regmap bulk transfers; int_status[] becomes u8, dropping the casts (Luca Ceresoli)
* patch 8: drop the audio input FS debug print and its register read instead of guarding the division; retitled; the commit message now describes the register as confirmed by Hermes Wu (Luca Ceresoli)
* patches 1, 2, 3, 5 and 7: collected Luca's Reviewed-by
* patches 1, 3, 5, 7, 9-12 and 14: carry Angelo's Reviewed-by and Tested-by given for v6 [2], which v7 and v8 failed to pick up; the patches that changed since (2, 4, 6, 8 and 13) don't carry them, patch 5 only gained newlines in its messages
* rebased onto next-20261119
* patches 9-14: no changes

v8:
* patch 4: keep the DP AUX unregister in remove() as well, so an i2c unbind waits for in-flight AUX device users before the regmap is freed; flagged by the Sashiko AI review of v7
* patch 5: terminate the new dev_err() messages with a newline
* patch 13: it6505_poweron() sets the powered flag and runs the logic reset and init sequence under audio_lock, closing a race with the delayed enable work flagged by the Sashiko AI review of v7; newline for the new dev_err() message
* rebased onto next-20260925
* patches 1-3, 6-12 and 14: no changes

v7:
* new patch 2: cancel link_works, hdcp_wait_ksv_list and hdcp_work in it6505_poweroff() so link training and HDCP authentication cannot run into a chip being powered off; pre-existing, found while assessing the Sashiko AI review of v6
* patch 13 (was 12): it6505_poweroff() clears the powered flag under audio_lock, closing the race between the codec ops and a concurrent power-off flagged by the Sashiko AI review of v6; the it6505_enable_audio() wrapper is folded into the delayed work
* the remaining v6 review findings are already fixed by later patches of this series (patches 3, 4, 6, 8, 11 and 12), concern pre-existing code outside its scope (whole-register restore in it6505_audio_input(), unchecked reads in it6505_aux_i2c_wait() and it6505_calc_video_info(), regulator disable order) or do not apply (AUX unregister on unbind, missing newline in dev_err())
* rebased onto next-20260923
* patches 1, 3-12 and 14: no changes

v6:
* patch 1: track notifier registration in a flag instead of clearing notifier_call, which a chain traversal racing the unregistration could have called as NULL (extcon traverses its raw notifier chain unlocked); flagged by Sashiko AI review of v5. The in-flight-callback race also flagged there is an extcon core limitation affecting all its consumers and cannot be closed from a consumer driver.
* patch 4: note that a failed regulator_disable() leaks the reference either way
* new patches 10 and 11: two more pre-existing fixes from v5 review, an uninitialised link-frequencies value and an error code written back to the reset register
* patches 2, 3, 5-9, 12 and 13: no changes

v5:
* patch 1: serialise notifier registration state with extcon_lock
* patch 2: also drop the runtime PM usage ref held for a connected display; retitled
* new patches 3-7 and 9: more pre-existing fixes from v4 review (AUX unregister symmetry, poweroff error path, IRQ status read errors, two divisions by zero, of_node_put before use)
* patch 10 (was 4): update plugged_cb/codec_dev under mode_lock
* patches 8 and 11: no changes

v4:
* patch 1: quiesce extcon notifier and IRQ before cancelling work, initialise extcon_wq in probe; retitled
* new patch 2: disable runtime PM on remove
* patch 3 (was 2): collected Chen-Yu Tsai's Reviewed-by
* patch 4 (was 3): start out muted; mute state and cached parameters updated under audio_lock; unregister codec after quiesce
* patch 5 (was 4): apply audio defaults at probe time

v3:
* new patches 1 and 2, fixing a pre-existing use-after-free on remove() and an out-of-bounds read with channel_count == 0
* patch 3 (was 1): serialise audio enable/disable with audio_lock; track mute state so the FIFO-error IRQ cannot undo a mute
* patch 4 (was 2): no changes

v2:
* keep and unregister the hdmi-codec platform_device on remove
* initialise delayed_audio before registering the codec device
* cancel delayed_audio synchronously on shutdown and remove
* disable audio immediately when muting
* patch 2: drop the encoder check instead of returning 0 early

v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/all/[email protected]/
v4: https://lore.kernel.org/all/[email protected]/
v5: https://lore.kernel.org/all/[email protected]/
v6: https://lore.kernel.org/all/[email protected]/
v7: https://lore.kernel.org/all/[email protected]/
v8: https://lore.kernel.org/all/[email protected]/

Daniel Golle (13):
drm/bridge: it6505: quiesce event sources and work on remove() drm/bridge: it6505: quiesce work items before powering off drm/bridge: it6505: balance and disable runtime PM on remove drm/bridge: it6505: unregister DP AUX adapter on bridge detach drm/bridge: it6505: complete poweroff even if disabling regulators
fails
drm/bridge: it6505: bail out of the IRQ handler when status reads fail drm/bridge: it6505: avoid division by zero in pixel clock calculation drm/bridge: it6505: drop the audio input FS debug print drm/bridge: it6505: guard against zero channel count in audio
infoframe
drm/bridge: it6505: hold endpoint OF node reference while parsing it drm/bridge: it6505: reject a too short link-frequencies property drm/bridge: it6505: don't write an error code back to the reset
register
drm/bridge: it6505: Don't reject audio hw_params without an encoder

Jiaxin Yu (1):
drm/bridge: it6505: Add audio support

 drivers/gpu/drm/bridge/ite-it6505.c | 323 ++++++++++++++++++++--------
 1 file changed, 239 insertions(+), 84 deletions(-)

base-commit: adcad7f4e6332cff3d6d7165f41584899f598534

Signature · 1 line
2.56.1
#1 lore raw

PATCH v9 1/14 drm/bridge: it6505: quiesce event sources and work on remove()

struct it6505 is freed by devres right after remove() returns, but remove() cancels none of the driver's work items, so link_works, hdcp_wait_ksv_list, hdcp_work and extcon_wq can still run afterwards and dereference freed memory. Cancelling alone would not be enough:
the threaded IRQ and the extcon notifier stay live until devres teardown and can requeue the works.

Unregister the extcon notifier and disable the IRQ first, then cancel all work. Make it6505_remove_notifier_module() idempotent, tracking the registration in a flag under extcon_lock, as both .detach() and remove() call it now. The notifier_call pointer is left intact:
extcon traverses its raw notifier chain without holding a lock, so a traversal racing with the unregistration may still invoke the callback. Also initialise extcon_wq in probe: cancel_work_sync() on a never-initialised work item trips WARN_ON(!work->func).

---
 drivers/gpu/drm/bridge/ite-it6505.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)
drivers/gpu/drm/bridge/ite-it6505.c +21 -6
index e136ac71edbb6..e980cc6d5760c 100644
@@ -443,6 +443,7 @@ struct it6505 {
 	struct drm_display_mode source_output_mode;
 	struct drm_display_mode video_info;
 	struct notifier_block event_nb;
+	bool extcon_registered;
 	struct extcon_dev *extcon;
 	struct work_struct extcon_wq;
 	int extcon_state;
@@ -2934,11 +2935,15 @@ static int it6505_use_notifier_module(struct it6505 *it6505)
 	int ret;
 	struct device *dev = it6505->dev;
 
+	mutex_lock(&it6505->extcon_lock);
 	it6505->event_nb.notifier_call = it6505_extcon_notifier;
-	INIT_WORK(&it6505->extcon_wq, it6505_extcon_work);
 	ret = devm_extcon_register_notifier(it6505->dev,
 					    it6505->extcon, EXTCON_DISP_DP,
 					    &it6505->event_nb);
+	if (!ret)
+		it6505->extcon_registered = true;
+	mutex_unlock(&it6505->extcon_lock);
+
 	if (ret) {
 		dev_err(dev, "failed to register notifier for DP");
 		return ret;
@@ -2951,13 +2956,16 @@ static int it6505_use_notifier_module(struct it6505 *it6505)
 
 static void it6505_remove_notifier_module(struct it6505 *it6505)
 {
-	if (it6505->extcon) {
-		devm_extcon_unregister_notifier(it6505->dev,
-						it6505->extcon,	EXTCON_DISP_DP,
+	mutex_lock(&it6505->extcon_lock);
+	if (it6505->extcon && it6505->extcon_registered) {
+		devm_extcon_unregister_notifier(it6505->dev, it6505->extcon,
+						EXTCON_DISP_DP,
 						&it6505->event_nb);
-
-		flush_work(&it6505->extcon_wq);
+		it6505->extcon_registered = false;
 	}
+	mutex_unlock(&it6505->extcon_lock);
+
+	flush_work(&it6505->extcon_wq);
 }
 
 static void __maybe_unused it6505_delayed_audio(struct work_struct *work)
@@ -3613,6 +3621,7 @@ static int it6505_i2c_probe(struct i2c_client *client)
 	INIT_WORK(&it6505->link_works, it6505_link_training_work);
 	INIT_WORK(&it6505->hdcp_wait_ksv_list, it6505_hdcp_wait_ksv_list);
 	INIT_DELAYED_WORK(&it6505->hdcp_work, it6505_hdcp_work);
+	INIT_WORK(&it6505->extcon_wq, it6505_extcon_work);
 	init_completion(&it6505->extcon_completion);
 	memset(it6505->dpcd, 0, sizeof(it6505->dpcd));
 	it6505->powered = false;
@@ -3645,6 +3654,12 @@ static void it6505_i2c_remove(struct i2c_client *client)
 	drm_bridge_remove(&it6505->bridge);
 	drm_dp_aux_unregister(&it6505->aux);
 	it6505_debugfs_remove(it6505);
+	it6505_remove_notifier_module(it6505);
+	disable_irq(it6505->irq);
+	cancel_work_sync(&it6505->link_works);
+	cancel_work_sync(&it6505->hdcp_wait_ksv_list);
+	cancel_delayed_work_sync(&it6505->hdcp_work);
+	cancel_work_sync(&it6505->extcon_wq);
 	it6505_poweroff(it6505);
 	it6505_remove_edid(it6505);
 }
Signature · 1 line
2.56.1
#2 lore raw

PATCH v9 2/14 drm/bridge: it6505: quiesce work items before powering off

In reply to Daniel Golle

it6505_poweroff() asserts the reset line and disables the regulators while link_works, hdcp_wait_ksv_list and hdcp_work may still be running. The work items and the register accessors only check it6505->powered, and the flag is cleared last, so a work item keeps driving link training or HDCP authentication into a chip that is already off until the flag catches up. Cancel the three work items before touching the power rails. None of them takes a runtime PM reference or extcon_lock, so the synchronous cancel is safe from every context that powers the chip off.

Fixes b5c84a9edcd4 ("drm/bridge: add it6505 driver")
---
 drivers/gpu/drm/bridge/ite-it6505.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/bridge/ite-it6505.c +3 -0
index e980cc6d5760c..52d7d818a5ea3 100644
@@ -2804,6 +2804,9 @@ static int it6505_poweroff(struct it6505 *it6505)
 	}
 
 	disable_irq_nosync(it6505->irq);
+	cancel_work_sync(&it6505->link_works);
+	cancel_work_sync(&it6505->hdcp_wait_ksv_list);
+	cancel_delayed_work_sync(&it6505->hdcp_work);
 
 	if (pdata->gpiod_reset)
 		gpiod_set_value_cansleep(pdata->gpiod_reset, 1);
Signature · 1 line
2.56.1
#4 lore raw

PATCH v9 3/14 drm/bridge: it6505: balance and disable runtime PM on remove

In reply to Daniel Golle

Runtime PM is enabled in probe but never disabled on remove, so rebinding the driver warns "Unbalanced pm_runtime_enable!". The extcon work also holds a usage reference while a display is connected, which unbinding leaks; the count survives in struct device, so after a rebind the device never runtime-suspends again.

Drop the usage reference held for a connected display and disable runtime PM in remove().

Fixes 10517777d302 ("drm/bridge: it6505: Adapt runtime power management framework")
---
 drivers/gpu/drm/bridge/ite-it6505.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/bridge/ite-it6505.c +3 -0
index 52d7d818a5ea3..9c4aae383c1c5 100644
@@ -3663,6 +3663,9 @@ static void it6505_i2c_remove(struct i2c_client *client)
 	cancel_work_sync(&it6505->hdcp_wait_ksv_list);
 	cancel_delayed_work_sync(&it6505->hdcp_work);
 	cancel_work_sync(&it6505->extcon_wq);
+	if (it6505->extcon_state)
+		pm_runtime_put_sync(&client->dev);
+	pm_runtime_disable(&client->dev);
 	it6505_poweroff(it6505);
 	it6505_remove_edid(it6505);
 }
Signature · 1 line
2.56.1
#5 lore raw

PATCH v9 4/14 drm/bridge: it6505: unregister DP AUX adapter on bridge detach

In reply to Daniel Golle

The DP AUX adapter is registered in .attach() but only unregistered in i2c remove(). Unbinding and rebinding the DRM device while the i2c driver stays bound registers the adapter a second time, which fails. Also unregister it in .detach() and on the .attach() error path, which so far leaked the registration. remove() keeps its call, which waits for in-flight AUX device users before devres frees the regmap.

Track the registration in a flag so that each path only unregisters an adapter that is actually registered. A mutex serialises the flag, so that remove() cannot return while .detach() is still waiting for AUX device users. aux_lock cannot be reused for this, as AUX transfers take it while drm_dp_aux_unregister() waits for them.

Fixes b5c84a9edcd4 ("drm/bridge: add it6505 driver")
---
 drivers/gpu/drm/bridge/ite-it6505.c | 33 ++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/ite-it6505.c +30 -3
index 9c4aae383c1c5..42fd24de9e147 100644
@@ -439,6 +439,8 @@ struct it6505 {
 	struct mutex extcon_lock;
 	struct mutex mode_lock; /* used to bridge_detect */
 	struct mutex aux_lock; /* used to aux data transfers */
+	struct mutex aux_reg_lock; /* protects aux_registered */
+	bool aux_registered;
 	struct regmap *regmap;
 	struct drm_display_mode source_output_mode;
 	struct drm_display_mode video_info;
@@ -3069,6 +3071,29 @@ static inline struct it6505 *bridge_to_it6505(struct drm_bridge *bridge)
 	return container_of(bridge, struct it6505, bridge);
 }
 
+static int it6505_register_aux(struct it6505 *it6505)
+{
+	int ret;
+
+	mutex_lock(&it6505->aux_reg_lock);
+	ret = drm_dp_aux_register(&it6505->aux);
+	if (!ret)
+		it6505->aux_registered = true;
+	mutex_unlock(&it6505->aux_reg_lock);
+
+	return ret;
+}
+
+static void it6505_unregister_aux(struct it6505 *it6505)
+{
+	mutex_lock(&it6505->aux_reg_lock);
+	if (it6505->aux_registered) {
+		drm_dp_aux_unregister(&it6505->aux);
+		it6505->aux_registered = false;
+	}
+	mutex_unlock(&it6505->aux_reg_lock);
+}
+
 static int it6505_bridge_attach(struct drm_bridge *bridge,
 				struct drm_encoder *encoder,
 				enum drm_bridge_attach_flags flags)
@@ -3085,8 +3110,7 @@ static int it6505_bridge_attach(struct drm_bridge *bridge,
 	/* Register aux channel */
 	it6505->aux.drm_dev = bridge->dev;
 
-	ret = drm_dp_aux_register(&it6505->aux);
-
+	ret = it6505_register_aux(it6505);
 	if (ret < 0) {
 		dev_err(dev, "Failed to register aux: %d", ret);
 		return ret;
@@ -3096,6 +3120,7 @@ static int it6505_bridge_attach(struct drm_bridge *bridge,
 		ret = it6505_use_notifier_module(it6505);
 		if (ret < 0) {
 			dev_err(dev, "use notifier module failed");
+			it6505_unregister_aux(it6505);
 			return ret;
 		}
 	}
@@ -3109,6 +3134,7 @@ static void it6505_bridge_detach(struct drm_bridge *bridge)
 
 	flush_work(&it6505->link_works);
 	it6505_remove_notifier_module(it6505);
+	it6505_unregister_aux(it6505);
 }
 
 static enum drm_mode_status
@@ -3573,6 +3599,7 @@ static int it6505_i2c_probe(struct i2c_client *client)
 	mutex_init(&it6505->extcon_lock);
 	mutex_init(&it6505->mode_lock);
 	mutex_init(&it6505->aux_lock);
+	mutex_init(&it6505->aux_reg_lock);
 
 	it6505->bridge.of_node = client->dev.of_node;
 	it6505->connector_status = connector_status_disconnected;
@@ -3655,7 +3682,7 @@ static void it6505_i2c_remove(struct i2c_client *client)
 	struct it6505 *it6505 = i2c_get_clientdata(client);
 
 	drm_bridge_remove(&it6505->bridge);
-	drm_dp_aux_unregister(&it6505->aux);
+	it6505_unregister_aux(it6505);
 	it6505_debugfs_remove(it6505);
 	it6505_remove_notifier_module(it6505);
 	disable_irq(it6505->irq);
Signature · 1 line
2.56.1
#6 lore raw

PATCH v9 5/14 drm/bridge: it6505: complete poweroff even if disabling regulators fails

In reply to Daniel Golle

it6505_poweroff() returns early when regulator_disable() fails, leaving it6505->powered set with the IRQ already disabled. The next it6505_poweron() then takes its early return and never re-enables the IRQ, leaving the bridge deaf to hotplug and link training interrupts. The regulator core keeps the consumer's enable count on a failed disable either way, so bailing out only adds a wedged bridge on top of the leaked reference. Log the error and complete the power-off state transition instead.

---
 drivers/gpu/drm/bridge/ite-it6505.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/ite-it6505.c +4 -2
index 42fd24de9e147..249c616300fde 100644
@@ -2816,13 +2816,15 @@ static int it6505_poweroff(struct it6505 *it6505)
 	if (pdata->pwr18) {
 		err = regulator_disable(pdata->pwr18);
 		if (err)
-			return err;
+			dev_err(dev, "cannot disable pwr18 regulator: %d\n",
+				err);
 	}
 
 	if (pdata->ovdd) {
 		err = regulator_disable(pdata->ovdd);
 		if (err)
-			return err;
+			dev_err(dev, "cannot disable ovdd regulator: %d\n",
+				err);
 	}
 
 	it6505->powered = false;
Signature · 1 line
2.56.1
#7 lore raw

PATCH v9 6/14 drm/bridge: it6505: bail out of the IRQ handler when status reads fail

In reply to Daniel Golle

When reading the interrupt status registers fails, the negative error codes end up in int_status[], where it6505_test_bit() sees almost all bits set: every interrupt sub-handler runs on garbage and the error values are even written back to the status registers.

Read the three contiguous status registers with a single regmap_bulk_read() and return IRQ_NONE if it fails. it6505_read() only adds the powered check on top of regmap_read(), which the handler has already done. Acknowledge them with a single regmap_bulk_write() as well, and switch int_status[] and its users to u8, dropping the casts.

Fixes b5c84a9edcd4 ("drm/bridge: add it6505 driver")
---
 drivers/gpu/drm/bridge/ite-it6505.c | 37 +++++++++++++++--------------
 1 file changed, 19 insertions(+), 18 deletions(-)
drivers/gpu/drm/bridge/ite-it6505.c +19 -18
index 249c616300fde..434a4fa39a911 100644
@@ -2639,12 +2639,13 @@ static void it6505_irq_link_train_fail(struct it6505 *it6505)
 	schedule_work(&it6505->link_works);
 }
 
-static bool it6505_test_bit(unsigned int bit, const unsigned int *addr)
+static bool it6505_test_bit(unsigned int bit, const u8 *addr)
 {
 	return 1 & (addr[bit / BITS_PER_BYTE] >> (bit % BITS_PER_BYTE));
 }
 
-static void it6505_irq_video_handler(struct it6505 *it6505, const int *int_status)
+static void it6505_irq_video_handler(struct it6505 *it6505,
+				     const u8 *int_status)
 {
 	struct device *dev = it6505->dev;
 	int reg_0d, reg_int03;
@@ -2655,11 +2656,9 @@ static void it6505_irq_video_handler(struct it6505 *it6505, const int *int_statu
 	 */
 
 	if ((!it6505_get_video_status(it6505) &&
-	     (it6505_test_bit(INT_SCDT_CHANGE, (unsigned int *)int_status))) ||
-	    (it6505_test_bit(BIT_INT_IO_FIFO_OVERFLOW,
-			     (unsigned int *)int_status)) ||
-	    (it6505_test_bit(BIT_INT_VID_FIFO_ERROR,
-			     (unsigned int *)int_status))) {
+	     (it6505_test_bit(INT_SCDT_CHANGE, int_status))) ||
+	    (it6505_test_bit(BIT_INT_IO_FIFO_OVERFLOW, int_status)) ||
+	    (it6505_test_bit(BIT_INT_VID_FIFO_ERROR, int_status))) {
 		it6505->auto_train_retry = AUTO_TRAIN_RETRY;
 		flush_work(&it6505->link_works);
 		it6505_stop_hdcp(it6505);
@@ -2684,7 +2683,7 @@ static void it6505_irq_video_handler(struct it6505 *it6505, const int *int_statu
 		return;
 	}
 
-	if (it6505_test_bit(INT_SCDT_CHANGE, (unsigned int *)int_status))
+	if (it6505_test_bit(INT_SCDT_CHANGE, int_status))
 		it6505_irq_scdt(it6505);
 }
 
@@ -2705,35 +2704,37 @@ static irqreturn_t it6505_int_threaded_handler(int unused, void *data)
 		{ BIT_INT_AUDIO_FIFO_ERROR, it6505_irq_audio_fifo_error },
 		{ BIT_INT_LINK_TRAIN_FAIL, it6505_irq_link_train_fail },
 	};
-	int int_status[3], i;
+	u8 int_status[3];
+	int i;
 
 	if (it6505->enable_drv_hold || !it6505->powered)
 		return IRQ_HANDLED;
 
 	pm_runtime_get_sync(dev);
 
-	int_status[0] = it6505_read(it6505, INT_STATUS_01);
-	int_status[1] = it6505_read(it6505, INT_STATUS_02);
-	int_status[2] = it6505_read(it6505, INT_STATUS_03);
+	if (regmap_bulk_read(it6505->regmap, INT_STATUS_01, int_status,
+			     ARRAY_SIZE(int_status))) {
+		pm_runtime_put_sync(dev);
+		return IRQ_NONE;
+	}
 
-	it6505_write(it6505, INT_STATUS_01, int_status[0]);
-	it6505_write(it6505, INT_STATUS_02, int_status[1]);
-	it6505_write(it6505, INT_STATUS_03, int_status[2]);
+	regmap_bulk_write(it6505->regmap, INT_STATUS_01, int_status,
+			  ARRAY_SIZE(int_status));
 
 	DRM_DEV_DEBUG_DRIVER(dev, "reg06 = 0x%02x", int_status[0]);
 	DRM_DEV_DEBUG_DRIVER(dev, "reg07 = 0x%02x", int_status[1]);
 	DRM_DEV_DEBUG_DRIVER(dev, "reg08 = 0x%02x", int_status[2]);
 	it6505_debug_print(it6505, REG_SYSTEM_STS, "");
 
-	if (it6505_test_bit(irq_vec[0].bit, (unsigned int *)int_status))
+	if (it6505_test_bit(irq_vec[0].bit, int_status))
 		irq_vec[0].handler(it6505);
 
 	if (it6505->hpd_state) {
 		for (i = 1; i < ARRAY_SIZE(irq_vec); i++) {
-			if (it6505_test_bit(irq_vec[i].bit, (unsigned int *)int_status))
+			if (it6505_test_bit(irq_vec[i].bit, int_status))
 				irq_vec[i].handler(it6505);
 		}
-		it6505_irq_video_handler(it6505, (unsigned int *)int_status);
+		it6505_irq_video_handler(it6505, int_status);
 	}
 
 	pm_runtime_put_sync(dev);
Signature · 1 line
2.56.1
#8 lore raw

PATCH v9 7/14 drm/bridge: it6505: avoid division by zero in pixel clock calculation

In reply to Daniel Golle

it6505_calc_video_info() checks the sum of the three pixel clock counter samples for zero before dividing it by 3, so sums of 1 or 2 truncate to 0 and the following pixel clock calculation divides by zero. Divide first and check the result.

---
 drivers/gpu/drm/bridge/ite-it6505.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/ite-it6505.c +2 -1
index 434a4fa39a911..9357996c2eb38 100644
@@ -753,12 +753,13 @@ static void it6505_calc_video_info(struct it6505 *it6505)
 		sum += rddata;
 	}
 
+	sum /= 3;
+
 	if (sum == 0) {
 		DRM_DEV_DEBUG_DRIVER(dev, "calc video timing error");
 		return;
 	}
 
-	sum /= 3;
 	pclk = 13500 * 2048 / sum;
 	it6505->video_info.clock = pclk;
 	it6505->video_info.hdisplay = hdew;
Signature · 1 line
2.56.1
#9 lore raw

PATCH v9 8/14 drm/bridge: it6505: drop the audio input FS debug print

In reply to Daniel Golle

it6505_enable_audio() reads REG_AUDIO_INPUT_FREQ only to print the measured audio sample rate, dividing by the readback. The register is a read-only counter of the input audio frequency, which the driver otherwise only uses to check whether an I2S bit clock is present. It reads back 0 when no audio clock has been latched, and it6505_read() returns a negative errno on i2c failure, while the arguments of the debug print are evaluated even with debug output disabled.

The value is only informational in the enable path and remains accessible through the regmap debugfs interface, so drop the read and the print instead of guarding the division.

Fixes b5c84a9edcd4 ("drm/bridge: add it6505 driver")
---
 drivers/gpu/drm/bridge/ite-it6505.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/bridge/ite-it6505.c +0 -4
index 9357996c2eb38..17f4f6497b34d 100644
@@ -1606,7 +1606,6 @@ static void it6505_disable_audio(struct it6505 *it6505)
 static void it6505_enable_audio(struct it6505 *it6505)
 {
 	struct device *dev = it6505->dev;
-	int regbe;
 
 	DRM_DEV_DEBUG_DRIVER(dev, "start");
 	it6505_disable_audio(it6505);
@@ -1624,9 +1623,6 @@ static void it6505_enable_audio(struct it6505 *it6505)
 			AUDIO_FIFO_RESET);
 	it6505_set_bits(it6505, REG_AUDIO_SRC_CTRL, AUDIO_FIFO_RESET, 0x00);
 	it6505_set_bits(it6505, REG_RESET_CTRL, AUDIO_RESET, 0x00);
-	regbe = it6505_read(it6505, REG_AUDIO_INPUT_FREQ);
-	DRM_DEV_DEBUG_DRIVER(dev, "regbe:0x%02x audio input fs: %d.%d kHz",
-			     regbe, 6750 / regbe, (6750 % regbe) * 10 / regbe);
 	it6505_set_bits(it6505, REG_DATA_MUTE_CTRL, EN_AUD_MUTE, 0x00);
 }
 
Signature · 1 line
2.56.1
#10 lore raw

PATCH v9 9/14 drm/bridge: it6505: guard against zero channel count in audio infoframe

In reply to Daniel Golle

it6505->audio.channel_count stays 0 until link training or a valid hw_params call has run, but it6505_enable_audio() can be reached before that from the audio-FIFO-error IRQ, making it6505_enable_audio_infoframe() index the 8-entry audio_info_ca[] table with -1. Bail out while the channel count is not yet known.

Also fix the debug print on the invalid-channel-count path, which logged the previously cached count instead of the rejected one.

---
 drivers/gpu/drm/bridge/ite-it6505.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/ite-it6505.c +4 -1
index 17f4f6497b34d..d0d2bac88a94c 100644
@@ -1579,6 +1579,9 @@ static void it6505_enable_audio_infoframe(struct it6505 *it6505)
 	struct device *dev = it6505->dev;
 	u8 audio_info_ca[] = { 0x00, 0x00, 0x01, 0x03, 0x07, 0x0B, 0x0F, 0x1F };
 
+	if (!it6505->audio.channel_count)
+		return;
+
 	DRM_DEV_DEBUG_DRIVER(dev, "infoframe channel_allocation:0x%02x",
 			     audio_info_ca[it6505->audio.channel_count - 1]);
 
@@ -3003,7 +3006,7 @@ static int __maybe_unused it6505_audio_setup_hw_params(struct it6505 *it6505,
 
 	if (params->cea.channels <= 1 || params->cea.channels > 8) {
 		DRM_DEV_DEBUG_DRIVER(dev, "channel number: %d not support",
-				     it6505->audio.channel_count);
+				     params->cea.channels);
 		return -EINVAL;
 	}
 
Signature · 1 line
2.56.1
#11 lore raw

PATCH v9 10/14 drm/bridge: it6505: hold endpoint OF node reference while parsing it

In reply to Daniel Golle

it6505_parse_dt() drops the reference to each endpoint node right after looking it up and then keeps reading its properties, racing with the node being freed under CONFIG_OF_DYNAMIC. Put the node only once parsing is done.

Fixes 380d920b582d ("drm/bridge: add it6505 driver to read data-lanes and link-frequencies from dt")
---
 drivers/gpu/drm/bridge/ite-it6505.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/ite-it6505.c +2 -2
index d0d2bac88a94c..e271ca625a393 100644
@@ -3382,7 +3382,6 @@ static void it6505_parse_dt(struct it6505 *it6505)
 	}
 
 	ep = of_graph_get_endpoint_by_regs(np, 1, 0);
-	of_node_put(ep);
 
 	if (ep) {
 		len = it6505_get_data_lanes_count(ep, 1, 4);
@@ -3395,13 +3394,13 @@ static void it6505_parse_dt(struct it6505 *it6505)
 			*max_lane_count = MAX_LANE_COUNT;
 			dev_err(dev, "error data-lanes, use default");
 		}
+		of_node_put(ep);
 	} else {
 		*max_lane_count = MAX_LANE_COUNT;
 		dev_err(dev, "error endpoint, use default");
 	}
 
 	ep = of_graph_get_endpoint_by_regs(np, 0, 0);
-	of_node_put(ep);
 
 	if (ep) {
 		len = of_property_read_variable_u64_array(ep,
@@ -3421,6 +3420,7 @@ static void it6505_parse_dt(struct it6505 *it6505)
 			dev_err(dev, "error link frequencies, use default");
 			*max_dpi_pixel_clock = DPI_PIXEL_CLK_MAX;
 		}
+		of_node_put(ep);
 	} else {
 		dev_err(dev, "error endpoint, use default");
 		*max_dpi_pixel_clock = DPI_PIXEL_CLK_MAX;
Signature · 1 line
2.56.1
#12 lore raw

PATCH v9 11/14 drm/bridge: it6505: reject a too short link-frequencies property

In reply to Daniel Golle

of_property_read_variable_u64_array() is asked for a minimum array size of zero, so a link-frequencies property shorter than one u64 -- a 32-bit value written by mistake, say -- returns 0 without storing anything. it6505_parse_dt() reads that as success and derives max_dpi_pixel_clock from an uninitialised stack variable. Ask for one element so a short property lands in the existing error path.

Fixes 380d920b582d ("drm/bridge: add it6505 driver to read data-lanes and link-frequencies from dt")
---
 drivers/gpu/drm/bridge/ite-it6505.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/ite-it6505.c +1 -1
index e271ca625a393..7737e6ecc4bda 100644
@@ -3405,7 +3405,7 @@ static void it6505_parse_dt(struct it6505 *it6505)
 	if (ep) {
 		len = of_property_read_variable_u64_array(ep,
 							  "link-frequencies",
-							  &link_frequencies, 0,
+							  &link_frequencies, 1,
 							  1);
 		if (len >= 0) {
 			do_div(link_frequencies, 1000);
Signature · 1 line
2.56.1
#13 lore raw

PATCH v9 12/14 drm/bridge: it6505: don't write an error code back to the reset register

In reply to Daniel Golle

it6505_audio_input() saves REG_RESET_CTRL, pulses AUDIO_RESET and writes the saved value back. it6505_read() returns a negative errno on i2c failure, which regmap truncates to eight bits on the way out:
-EIO turns into 0xfb, holding video, audio, AUX and HDCP in reset. A failed REG_AUDIO_INPUT_FREQ read is just as wrong, as any negative value passes the != 0xFF test and reports an audio clock that was never sampled. Bail out before touching the register and only report audio input for a usable readback.

---
 drivers/gpu/drm/bridge/ite-it6505.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/ite-it6505.c +4 -1
index 7737e6ecc4bda..2da58d94127c3 100644
@@ -1518,12 +1518,15 @@ static bool it6505_audio_input(struct it6505 *it6505)
 	int reg05, regbe;
 
 	reg05 = it6505_read(it6505, REG_RESET_CTRL);
+	if (reg05 < 0)
+		return false;
+
 	it6505_set_bits(it6505, REG_RESET_CTRL, AUDIO_RESET, 0x00);
 	usleep_range(3000, 4000);
 	regbe = it6505_read(it6505, REG_AUDIO_INPUT_FREQ);
 	it6505_write(it6505, REG_RESET_CTRL, reg05);
 
-	return regbe != 0xFF;
+	return regbe > 0 && regbe != 0xFF;
 }
 
 static void it6505_setup_audio_channel_status(struct it6505 *it6505)
Signature · 1 line
2.56.1
#14 lore raw

PATCH v9 13/14 drm/bridge: it6505: Add audio support

In reply to Daniel Golle

From: Jiaxin Yu <[email protected]>

Add audio support for it6505 by bridging to the hdmi-codec: register an "hdmi-audio-codec" platform device from probe and wire up the previously unused audio helpers via hdmi_codec_ops. This unblocks the mt8186-mt6366 sound card which references it6505 as the I2S3 codec.

Audio starts out muted and is only enabled once the stream is unmuted, since some DP-to-HDMI dongles get into a bad state if the InfoFrame is sent without audio data. Enable/disable can race between the FIFO-error IRQ, the delayed enable work, the hdmi-codec ops and the HPD-low path, so the register sequences, the mute state and the cached stream parameters are serialised with a new audio_lock mutex. it6505_poweron() and it6505_poweroff() change it6505->powered under the same lock, poweron holding it across the logic reset and init
sequence: the codec ops and the delayed work check the flag before writing registers, and the mute and shutdown ops run from ALSA, where a work cancel cannot reach them. plugged_cb/codec_dev updates take mode_lock, the lock it6505_detect() holds when calling back into the codec.

---
 drivers/gpu/drm/bridge/ite-it6505.c | 168 ++++++++++++++++++++++------
 1 file changed, 136 insertions(+), 32 deletions(-)
drivers/gpu/drm/bridge/ite-it6505.c +136 -32
index 2da58d94127c3..eedc46eaf974b 100644
@@ -407,6 +407,7 @@ struct it6505_audio_data {
 	u8 i2s_data_delay;
 	u8 i2s_ws_channel;
 	u8 i2s_data_sequence;
+	bool mute;
 };
 
 struct it6505_audio_sample_rate_map {
@@ -441,6 +442,7 @@ struct it6505 {
 	struct mutex aux_lock; /* used to aux data transfers */
 	struct mutex aux_reg_lock; /* protects aux_registered */
 	bool aux_registered;
+	struct mutex audio_lock; /* audio enable/disable vs. power on/off */
 	struct regmap *regmap;
 	struct drm_display_mode source_output_mode;
 	struct drm_display_mode video_info;
@@ -479,6 +481,7 @@ struct it6505 {
 	bool enable_enhanced_frame;
 	hdmi_codec_plugged_cb plugged_cb;
 	struct device *codec_dev;
+	struct platform_device *audio_pdev;
 	struct delayed_work delayed_audio;
 	struct it6505_audio_data audio;
 	struct dentry *debugfs;
@@ -1601,7 +1604,7 @@ static void it6505_enable_audio_infoframe(struct it6505 *it6505)
 			EN_AUD_CTRL_PKT);
 }
 
-static void it6505_disable_audio(struct it6505 *it6505)
+static void __it6505_disable_audio(struct it6505 *it6505)
 {
 	it6505_set_bits(it6505, REG_DATA_MUTE_CTRL, EN_AUD_MUTE, EN_AUD_MUTE);
 	it6505_set_bits(it6505, REG_AUDIO_SRC_CTRL, M_AUDIO_I2S_EN, 0x00);
@@ -1609,12 +1612,20 @@ static void it6505_disable_audio(struct it6505 *it6505)
 	it6505_set_bits(it6505, REG_RESET_CTRL, AUDIO_RESET, AUDIO_RESET);
 }
 
-static void it6505_enable_audio(struct it6505 *it6505)
+static void it6505_disable_audio(struct it6505 *it6505)
+{
+	mutex_lock(&it6505->audio_lock);
+	__it6505_disable_audio(it6505);
+	mutex_unlock(&it6505->audio_lock);
+}
+
+static void __it6505_enable_audio(struct it6505 *it6505)
 {
 	struct device *dev = it6505->dev;
 
 	DRM_DEV_DEBUG_DRIVER(dev, "start");
-	it6505_disable_audio(it6505);
+
+	__it6505_disable_audio(it6505);
 
 	it6505_setup_audio_channel_status(it6505);
 	it6505_setup_audio_format(it6505);
@@ -2326,19 +2337,12 @@ static void it6505_stop_link_train(struct it6505 *it6505)
 
 static void it6505_link_train_ok(struct it6505 *it6505)
 {
-	struct device *dev = it6505->dev;
-
 	it6505->link_state = LINK_OK;
 	/* disalbe mute enable avi info frame */
 	it6505_set_bits(it6505, REG_DATA_MUTE_CTRL, EN_VID_MUTE, 0x00);
 	it6505_set_bits(it6505, REG_INFOFRAME_CTRL,
 			EN_VID_CTRL_PKT, EN_VID_CTRL_PKT);
 
-	if (it6505_audio_input(it6505)) {
-		DRM_DEV_DEBUG_DRIVER(dev, "Enable audio!");
-		it6505_enable_audio(it6505);
-	}
-
 	if (it6505->hdcp_desired)
 		it6505_start_hdcp(it6505);
 }
@@ -2630,8 +2634,10 @@ static void it6505_irq_audio_fifo_error(struct it6505 *it6505)
 
 	DRM_DEV_DEBUG_DRIVER(dev, "audio fifo error Interrupt");
 
-	if (it6505_audio_input(it6505))
-		it6505_enable_audio(it6505);
+	mutex_lock(&it6505->audio_lock);
+	if (!it6505->audio.mute && it6505_audio_input(it6505))
+		__it6505_enable_audio(it6505);
+	mutex_unlock(&it6505->audio_lock);
 }
 
 static void it6505_irq_link_train_fail(struct it6505 *it6505)
@@ -2785,11 +2791,13 @@ static int it6505_poweron(struct it6505 *it6505)
 		usleep_range(25000, 35000);
 	}
 
+	mutex_lock(&it6505->audio_lock);
 	it6505->powered = true;
 	it6505_reset_logic(it6505);
 	it6505_int_mask_enable(it6505);
 	it6505_init(it6505);
 	it6505_lane_off(it6505);
+	mutex_unlock(&it6505->audio_lock);
 
 	enable_irq(it6505->irq);
 
@@ -2814,6 +2822,8 @@ static int it6505_poweroff(struct it6505 *it6505)
 	cancel_work_sync(&it6505->hdcp_wait_ksv_list);
 	cancel_delayed_work_sync(&it6505->hdcp_work);
 
+	mutex_lock(&it6505->audio_lock);
+
 	if (pdata->gpiod_reset)
 		gpiod_set_value_cansleep(pdata->gpiod_reset, 1);
 
@@ -2833,6 +2843,7 @@ static int it6505_poweroff(struct it6505 *it6505)
 
 	it6505->powered = false;
 	it6505->sink_count = 0;
+	mutex_unlock(&it6505->audio_lock);
 
 	return 0;
 }
@@ -2979,25 +2990,28 @@ static void it6505_remove_notifier_module(struct it6505 *it6505)
 	flush_work(&it6505->extcon_wq);
 }
 
-static void __maybe_unused it6505_delayed_audio(struct work_struct *work)
+static void it6505_delayed_audio(struct work_struct *work)
 {
 	struct it6505 *it6505 = container_of(work, struct it6505,
 					     delayed_audio.work);
 
 	DRM_DEV_DEBUG_DRIVER(it6505->dev, "start");
 
-	if (!it6505->powered)
+	if (it6505->enable_drv_hold)
 		return;
 
-	if (!it6505->enable_drv_hold)
-		it6505_enable_audio(it6505);
+	mutex_lock(&it6505->audio_lock);
+	if (it6505->powered && !it6505->audio.mute)
+		__it6505_enable_audio(it6505);
+	mutex_unlock(&it6505->audio_lock);
 }
 
-static int __maybe_unused it6505_audio_setup_hw_params(struct it6505 *it6505,
-						       struct hdmi_codec_params
-						       *params)
+static int it6505_audio_setup_hw_params(struct it6505 *it6505,
+					struct hdmi_codec_params
+					*params)
 {
 	struct device *dev = it6505->dev;
+	u8 word_length;
 	int i = 0;
 
 	DRM_DEV_DEBUG_DRIVER(dev, "%s %d Hz, %d bit, %d channels\n", __func__,
@@ -3013,8 +3027,6 @@ static int __maybe_unused it6505_audio_setup_hw_params(struct it6505 *it6505,
 		return -EINVAL;
 	}
 
-	it6505->audio.channel_count = params->cea.channels;
-
 	while (i < ARRAY_SIZE(audio_sample_rate_map) &&
 	       params->sample_rate !=
 		       audio_sample_rate_map[i].sample_rate_value) {
@@ -3025,21 +3037,20 @@ static int __maybe_unused it6505_audio_setup_hw_params(struct it6505 *it6505,
 				     params->sample_rate);
 		return -EINVAL;
 	}
-	it6505->audio.sample_rate = audio_sample_rate_map[i].rate;
 
 	switch (params->sample_width) {
 	case 16:
-		it6505->audio.word_length = WORD_LENGTH_16BIT;
+		word_length = WORD_LENGTH_16BIT;
 		break;
 	case 18:
-		it6505->audio.word_length = WORD_LENGTH_18BIT;
+		word_length = WORD_LENGTH_18BIT;
 		break;
 	case 20:
-		it6505->audio.word_length = WORD_LENGTH_20BIT;
+		word_length = WORD_LENGTH_20BIT;
 		break;
 	case 24:
 	case 32:
-		it6505->audio.word_length = WORD_LENGTH_24BIT;
+		word_length = WORD_LENGTH_24BIT;
 		break;
 	default:
 		DRM_DEV_DEBUG_DRIVER(dev, "wordlength: %d bit not support",
@@ -3047,27 +3058,111 @@ static int __maybe_unused it6505_audio_setup_hw_params(struct it6505 *it6505,
 		return -EINVAL;
 	}
 
+	mutex_lock(&it6505->audio_lock);
+	it6505->audio.channel_count = params->cea.channels;
+	it6505->audio.sample_rate = audio_sample_rate_map[i].rate;
+	it6505->audio.word_length = word_length;
+	mutex_unlock(&it6505->audio_lock);
+
 	return 0;
 }
 
-static void __maybe_unused it6505_audio_shutdown(struct device *dev, void *data)
+static void it6505_audio_shutdown(struct device *dev, void *data)
 {
 	struct it6505 *it6505 = dev_get_drvdata(dev);
 
+	mutex_lock(&it6505->audio_lock);
+	it6505->audio.mute = true;
 	if (it6505->powered)
-		it6505_disable_audio(it6505);
+		__it6505_disable_audio(it6505);
+	mutex_unlock(&it6505->audio_lock);
+	cancel_delayed_work_sync(&it6505->delayed_audio);
+}
+
+static int it6505_audio_hw_params(struct device *dev, void *data,
+				  struct hdmi_codec_daifmt *daifmt,
+				  struct hdmi_codec_params *params)
+{
+	struct it6505 *it6505 = dev_get_drvdata(dev);
+
+	return it6505_audio_setup_hw_params(it6505, params);
+}
+
+static int it6505_audio_mute(struct device *dev, void *data,
+			     bool enable, int direction)
+{
+	struct it6505 *it6505 = dev_get_drvdata(dev);
+
+	DRM_DEV_DEBUG_DRIVER(dev, "mute: %d", enable);
+
+	/*
+	 * Delay enabling audio until the stream is unmuted; InfoFrames
+	 * without audio data upset some DP-to-HDMI dongles.
+	 */
+	if (enable) {
+		mutex_lock(&it6505->audio_lock);
+		it6505->audio.mute = true;
+		if (it6505->powered)
+			__it6505_disable_audio(it6505);
+		mutex_unlock(&it6505->audio_lock);
+		cancel_delayed_work_sync(&it6505->delayed_audio);
+	} else {
+		mutex_lock(&it6505->audio_lock);
+		it6505->audio.mute = false;
+		mutex_unlock(&it6505->audio_lock);
+		queue_delayed_work(system_wq, &it6505->delayed_audio,
+				   msecs_to_jiffies(180));
+	}
+
+	return 0;
 }
 
-static int __maybe_unused it6505_audio_hook_plugged_cb(struct device *dev,
-						       void *data,
-						       hdmi_codec_plugged_cb fn,
-						       struct device *codec_dev)
+static int it6505_audio_hook_plugged_cb(struct device *dev,
+					void *data,
+					hdmi_codec_plugged_cb fn,
+					struct device *codec_dev)
 {
 	struct it6505 *it6505 = data;
 
+	mutex_lock(&it6505->mode_lock);
 	it6505->plugged_cb = fn;
 	it6505->codec_dev = codec_dev;
 	it6505_plugged_status_to_codec(it6505);
+	mutex_unlock(&it6505->mode_lock);
+
+	return 0;
+}
+
+static const struct hdmi_codec_ops it6505_audio_codec_ops = {
+	.hw_params = it6505_audio_hw_params,
+	.mute_stream = it6505_audio_mute,
+	.audio_shutdown = it6505_audio_shutdown,
+	.hook_plugged_cb = it6505_audio_hook_plugged_cb,
+};
+
+static int it6505_register_audio_driver(struct device *dev)
+{
+	struct it6505 *it6505 = dev_get_drvdata(dev);
+	struct hdmi_codec_pdata codec_data = {
+		.ops = &it6505_audio_codec_ops,
+		.max_i2s_channels = 8,
+		.i2s = 1,
+		.no_capture_mute = 1,
+		.data = it6505,
+	};
+	struct platform_device *pdev;
+
+	it6505->audio.mute = true;
+	INIT_DELAYED_WORK(&it6505->delayed_audio, it6505_delayed_audio);
+
+	pdev = platform_device_register_data(dev, HDMI_CODEC_DRV_NAME,
+					     PLATFORM_DEVID_AUTO, &codec_data,
+					     sizeof(codec_data));
+	if (IS_ERR(pdev))
+		return PTR_ERR(pdev);
+
+	it6505->audio_pdev = pdev;
+	DRM_DEV_DEBUG_DRIVER(dev, "bound to %s", HDMI_CODEC_DRV_NAME);
 
 	return 0;
 }
@@ -3606,6 +3701,7 @@ static int it6505_i2c_probe(struct i2c_client *client)
 	mutex_init(&it6505->mode_lock);
 	mutex_init(&it6505->aux_lock);
 	mutex_init(&it6505->aux_reg_lock);
+	mutex_init(&it6505->audio_lock);
 
 	it6505->bridge.of_node = client->dev.of_node;
 	it6505->connector_status = connector_status_disconnected;
@@ -3654,6 +3750,12 @@ static int it6505_i2c_probe(struct i2c_client *client)
 	if (err)
 		return err;
 
+	err = it6505_register_audio_driver(dev);
+	if (err < 0) {
+		dev_err(dev, "Failed to register audio driver: %d\n", err);
+		return err;
+	}
+
 	INIT_WORK(&it6505->link_works, it6505_link_training_work);
 	INIT_WORK(&it6505->hdcp_wait_ksv_list, it6505_hdcp_wait_ksv_list);
 	INIT_DELAYED_WORK(&it6505->hdcp_work, it6505_hdcp_work);
@@ -3696,6 +3798,8 @@ static void it6505_i2c_remove(struct i2c_client *client)
 	cancel_work_sync(&it6505->hdcp_wait_ksv_list);
 	cancel_delayed_work_sync(&it6505->hdcp_work);
 	cancel_work_sync(&it6505->extcon_wq);
+	platform_device_unregister(it6505->audio_pdev);
+	cancel_delayed_work_sync(&it6505->delayed_audio);
 	if (it6505->extcon_state)
 		pm_runtime_put_sync(&client->dev);
 	pm_runtime_disable(&client->dev);
Signature · 1 line
2.56.1
#16 lore raw

PATCH v9 14/14 drm/bridge: it6505: Don't reject audio hw_params without an encoder

In reply to Daniel Golle

it6505_audio_setup_hw_params() returns -ENODEV when no encoder is attached. With it6505 registering an hdmi-audio-codec this runs for every stream on the I2S DAI, and on mt8186-corsola, where the rt1019 speaker amplifier shares I2S3, the error tears down the whole DPCM backend and breaks speaker playback whenever no display is attached.

The function only caches stream parameters, which needs no encoder. Drop the check, and apply the audio defaults once at probe instead of in it6505_variable_config(), which would clobber the cached parameters again on every hotplug. Actual audio output remains gated by it6505->powered.

---
 drivers/gpu/drm/bridge/ite-it6505.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/gpu/drm/bridge/ite-it6505.c +10 -13
index eedc46eaf974b..d39f2c396cfc8 100644
@@ -1373,16 +1373,6 @@ static void it6505_variable_config(struct it6505 *it6505)
 	it6505->link_state = LINK_IDLE;
 	it6505->hdcp_desired = HDCP_DESIRED;
 	it6505->auto_train_retry = AUTO_TRAIN_RETRY;
-	it6505->audio.select = AUDIO_SELECT;
-	it6505->audio.sample_rate = AUDIO_SAMPLE_RATE;
-	it6505->audio.channel_count = AUDIO_CHANNEL_COUNT;
-	it6505->audio.type = AUDIO_TYPE;
-	it6505->audio.i2s_input_format = I2S_INPUT_FORMAT;
-	it6505->audio.i2s_justified = I2S_JUSTIFIED;
-	it6505->audio.i2s_data_delay = I2S_DATA_DELAY;
-	it6505->audio.i2s_ws_channel = I2S_WS_CHANNEL;
-	it6505->audio.i2s_data_sequence = I2S_DATA_SEQUENCE;
-	it6505->audio.word_length = AUDIO_WORD_LENGTH;
 	memset(it6505->sha1_input, 0, sizeof(it6505->sha1_input));
 	memset(it6505->bksvs, 0, sizeof(it6505->bksvs));
 }
@@ -3018,9 +3008,6 @@ static int it6505_audio_setup_hw_params(struct it6505 *it6505,
 			     params->sample_rate, params->sample_width,
 			     params->cea.channels);
 
-	if (!it6505->bridge.encoder)
-		return -ENODEV;
-
 	if (params->cea.channels <= 1 || params->cea.channels > 8) {
 		DRM_DEV_DEBUG_DRIVER(dev, "channel number: %d not support",
 				     params->cea.channels);
@@ -3152,6 +3139,16 @@ static int it6505_register_audio_driver(struct device *dev)
 	};
 	struct platform_device *pdev;
 
+	it6505->audio.select = AUDIO_SELECT;
+	it6505->audio.sample_rate = AUDIO_SAMPLE_RATE;
+	it6505->audio.channel_count = AUDIO_CHANNEL_COUNT;
+	it6505->audio.type = AUDIO_TYPE;
+	it6505->audio.i2s_input_format = I2S_INPUT_FORMAT;
+	it6505->audio.i2s_justified = I2S_JUSTIFIED;
+	it6505->audio.i2s_data_delay = I2S_DATA_DELAY;
+	it6505->audio.i2s_ws_channel = I2S_WS_CHANNEL;
+	it6505->audio.i2s_data_sequence = I2S_DATA_SEQUENCE;
+	it6505->audio.word_length = AUDIO_WORD_LENGTH;
 	it6505->audio.mute = true;
 	INIT_DELAYED_WORK(&it6505->delayed_audio, it6505_delayed_audio);
 
Signature · 1 line
2.56.1
#17 lore raw
In reply to Daniel Golle

v9 accidentally went out with the per-patch changelogs stripped. Their content is covered by the changelog in the cover letter and by the commit messages, except for two details of patch 13 ("drm/bridge: it6505: Add audio support"):

v4: the FIFO-error IRQ probes for audio input and enables audio in a
single section under audio_lock

v2: audio is enabled and disabled from .mute_stream, as hdmi_codec_ops
no longer has a .trigger callback

Daniel

#3 lore raw

Re: [PATCH v9 02/14] drm/bridge: it6505: quiesce work items before powering off

In reply to Daniel Golle
Thank you for your contribution! Sashiko AI review found 1 potential issue to consider: - [Medium] drm/bridge: it6505: missing IRQ sync in it6505_poweroff() allows work requeue --

Thank you for your contribution! Sashiko AI review found 1 potential issue to consider:
- [Medium] drm/bridge: it6505: missing IRQ sync in it6505_poweroff() allows work requeue
--

commit 047992d501bf36c86f72d05d9e0cb5d26d252fa0
Author: Daniel Golle <[email protected]>

drm/bridge: it6505: quiesce work items before powering off

This commit cancels link_works, hdcp_wait_ksv_list, and hdcp_work in it6505_poweroff() before asserting reset and disabling the power rails.

Quoted 5 lines
drivers/gpu/drm/bridge/ite-it6505.c +0 -0
index e980cc6d5760c..52d7d818a5ea3 100644

drivers/gpu/drm/bridge/ite-it6505.c static int it6505_poweroff(struct it6505 *it6505) · line 2812

Quoted 9 lines
drivers/gpu/drm/bridge/ite-it6505.c +3 -0
@@ -2804,6 +2804,9 @@ static int it6505_poweroff(struct it6505 *it6505)
 	}
 
 	disable_irq_nosync(it6505->irq);
+	cancel_work_sync(&it6505->link_works);
+	cancel_work_sync(&it6505->hdcp_wait_ksv_list);
+	cancel_delayed_work_sync(&it6505->hdcp_work);
 
 	if (pdata->gpiod_reset)
 		gpiod_set_value_cansleep(pdata->gpiod_reset, 1);

[Severity: Medium]
Can an in-flight it6505_int_threaded_handler() requeue these work items right after cancel_work_sync() and cancel_delayed_work_sync() return?

During system suspend, pm_runtime_force_suspend() disables runtime PM and calls it6505_bridge_suspend() -> it6505_poweroff() without waiting for a running threaded IRQ handler. Because it6505_poweroff() uses disable_irq_nosync(), an already-running handler can schedule work after the synchronous cancels finish:

CPU0 CPU1 (irq/it6505-int)
it6505_int_threaded_handler()
regmap_bulk_read(INT_STATUS_01..03)
it6505_irq_scdt()

    it6505_calc_video_info()
pm_runtime_force_suspend()
  it6505_poweroff()
    disable_irq_nosync(it6505->irq)
    cancel_work_sync(&link_works)
    ...
    gpiod_set_value_cansleep(reset, 1)
                                      schedule_work(&link_works)
                                        <-- runs against powered-off chip
    regulator_disable(...)
    it6505->powered = false;

Since it6505->powered is cleared last, the requeued work can issue I2C and DP AUX transactions while the chip is held in reset or powering down, or leave hdcp_work pending across poweroff. Using disable_irq() (or synchronize_irq() when called from outside the IRQ thread) before canceling the work items would ensure the handler has finished.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
#15 lore raw

Re: [PATCH v9 13/14] drm/bridge: it6505: Add audio support

In reply to Daniel Golle
Thank you for your contribution! Sashiko AI review found 3 potential issues to consider: - [Medium] drm/bridge: it6505: audio not enabled in it6505_link_train_ok() when unmuted - [Medium]…

Thank you for your contribution! Sashiko AI review found 3 potential issues to consider:
- [Medium] drm/bridge: it6505: audio not enabled in it6505_link_train_ok() when unmuted
- [Medium] drm/bridge: it6505: unlocked chip reset in it6505_process_hpd_irq()
- [Medium] drm/bridge: it6505: uncanceled delayed_audio on HPD low in it6505_irq_hpd()
--

commit 9525a8456c7b3a8b8b712a90e98e5ba9c8adfe1a
Author: Jiaxin Yu <[email protected]>

drm/bridge: it6505: Add audio support

This commit registers an hdmi-audio-codec platform device for it6505, wires up the hdmi_codec_ops callbacks, and serializes audio state and hardware register updates with an audio_lock mutex.

Quoted 4 lines
drivers/gpu/drm/bridge/ite-it6505.c +0 -0
index 2da58d94127c3..eedc46eaf974b 100644

[ ... ]

Quoted 10 lines
drivers/gpu/drm/bridge/ite-it6505.c +0 -2
@@ -2326,19 +2337,12 @@ static void it6505_stop_link_train(struct it6505 *it6505)
 
 static void it6505_link_train_ok(struct it6505 *it6505)
 {
-	struct device *dev = it6505->dev;
-
 	it6505->link_state = LINK_OK;
 	/* disalbe mute enable avi info frame */
 	it6505_set_bits(it6505, REG_DATA_MUTE_CTRL, EN_VID_MUTE, 0x00);
 	it6505_set_bits(it6505, REG_INFOFRAME_CTRL,

drivers/gpu/drm/bridge/ite-it6505.c static void it6505_stop_link_train(struct it6505 *it6505) · line 2348

Quoted 10 lines
drivers/gpu/drm/bridge/ite-it6505.c +0 -5
 			EN_VID_CTRL_PKT, EN_VID_CTRL_PKT);
 
-	if (it6505_audio_input(it6505)) {
-		DRM_DEV_DEBUG_DRIVER(dev, "Enable audio!");
-		it6505_enable_audio(it6505);
-	}
-
 	if (it6505->hdcp_desired)
 		it6505_start_hdcp(it6505);
 }

[Severity: Medium]
Does removing audio enablement from it6505_link_train_ok() completely leave audio disabled in hardware whenever link training finishes after the ALSA stream is already unmuted?

With this removal, __it6505_enable_audio() is only called from it6505_delayed_audio() (scheduled once, 180 ms after it6505_audio_mute() unmutes the stream) and from it6505_irq_audio_fifo_error() (which cannot fire while AUDIO_RESET is asserted and M_AUDIO_I2S_EN is cleared). If an active stream is interrupted by an HPD low-to-high pulse (where it6505_irq_hpd() calls it6505_disable_audio()), or if ALSA unmutes the stream more than 180 ms before it6505_poweron() and link training complete, it6505->audio.mute is false when it6505_link_train_ok() runs, yet nothing re-enables audio.

Should it6505_link_train_ok() still enable audio (or schedule it6505->delayed_audio) when !it6505->audio.mute?

[ ... ]

drivers/gpu/drm/bridge/ite-it6505.c static int it6505_poweron(struct it6505 *it6505) · line 2802

Quoted 13 lines
drivers/gpu/drm/bridge/ite-it6505.c +2 -0
@@ -2785,11 +2791,13 @@ static int it6505_poweron(struct it6505 *it6505)
 		usleep_range(25000, 35000);
 	}
 
+	mutex_lock(&it6505->audio_lock);
 	it6505->powered = true;
 	it6505_reset_logic(it6505);
 	it6505_int_mask_enable(it6505);
 	it6505_init(it6505);
 	it6505_lane_off(it6505);
+	mutex_unlock(&it6505->audio_lock);
 
 	enable_irq(it6505->irq);

[Severity: Medium]
it6505_poweron() holds it6505->audio_lock across it6505_reset_logic(), it6505_int_mask_enable(), and it6505_init(), but what about it6505_process_hpd_irq()?

drivers/gpu/drm/bridge/ite-it6505.c:it6505_process_hpd_irq() {
    ...
	if (it6505->branch_device && dpcd_sink_count != it6505->sink_count) {
		memset(it6505->dpcd, 0, sizeof(it6505->dpcd));
		it6505->sink_count = dpcd_sink_count;
		it6505_reset_logic(it6505);
		it6505_int_mask_enable(it6505);
		it6505_init(it6505);
		it6505_remove_edid(it6505);
		return 0;
	}
    ...
}

When a branch device signals a downstream sink-count change via HPD_IRQ, this runs the same ALL_LOGIC_RESET and register init sequence while it6505->powered is true without holding it6505->audio_lock, so it can interleave with __it6505_enable_audio() or __it6505_disable_audio() and corrupt the audio, mute, and InfoFrame register configuration.

[ ... ]

Quoted 13 lines
drivers/gpu/drm/bridge/ite-it6505.c +1 -2
@@ -2979,25 +2990,28 @@ static void it6505_remove_notifier_module(struct it6505 *it6505)
 	flush_work(&it6505->extcon_wq);
 }
 
-static void __maybe_unused it6505_delayed_audio(struct work_struct *work)
+static void it6505_delayed_audio(struct work_struct *work)
 {
 	struct it6505 *it6505 = container_of(work, struct it6505,
 					     delayed_audio.work);
 
 	DRM_DEV_DEBUG_DRIVER(it6505->dev, "start");
 
-	if (!it6505->powered)

drivers/gpu/drm/bridge/ite-it6505.c static void it6505_remove_notifier_module(struct it6505 *it6505) · line 3007

Quoted 10 lines
drivers/gpu/drm/bridge/ite-it6505.c +5 -2
+	if (it6505->enable_drv_hold)
 		return;
 
-	if (!it6505->enable_drv_hold)
-		it6505_enable_audio(it6505);
+	mutex_lock(&it6505->audio_lock);
+	if (it6505->powered && !it6505->audio.mute)
+		__it6505_enable_audio(it6505);
+	mutex_unlock(&it6505->audio_lock);
 }

[Severity: Medium]
Can it6505_delayed_audio() re-enable audio and Audio InfoFrames after HPD has gone low and the link has been shut down?

CPU0 CPU1
it6505_audio_mute(..., false, ...)
it6505->audio.mute = false
queue_delayed_work(...,

    &it6505->delayed_audio, 180ms)
                                  it6505_int_threaded_handler()
                                    it6505_irq_hpd() /* hpd_state == false */
                                      it6505_disable_audio()
                                      it6505_stop_link_train()
                                      it6505_lane_off()

it6505_delayed_audio()
if (it6505->powered &&
!it6505->audio.mute)
__it6505_enable_audio() <-- enables audio with link and lanes off

When HPD goes low in it6505_irq_hpd(), it6505->delayed_audio is not cancelled and it6505->powered remains true until extcon or runtime PM powers the chip off. it6505_delayed_audio() does not check it6505->hpd_state or it6505->link_state == LINK_OK before calling __it6505_enable_audio().

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=13