drm/vc4: hdmi: Remove duplicate hotplug helper call#7489
Merged
Conversation
vc4_hdmi_handle_hotplug() calls drm_atomic_helper_connector_hdmi_hotplug() twice: once from the downstream commit 7a761a6 ("vc4: Add jack detection to HDMI audio driver") and once from the upstream code it was rebased onto, which gained the same call in commit 34f051a ("drm/vc4: hdmi: Call HDMI hotplug helper on disconnect"). The helper reads the EDID over DDC, so every detect currently performs two full EDID reads and signals the audio jack state twice. Drop the duplicate and keep the call where upstream has it, after the locking comment. Fixes: 7a761a6 ("vc4: Add jack detection to HDMI audio driver") Signed-off-by: Dom Cobley <popcornmix@gmail.com>
pelwell
approved these changes
Jul 13, 2026
popcornmix
added a commit
to raspberrypi/firmware
that referenced
this pull request
Jul 15, 2026
See: raspberrypi/linux#7500 kernel: staging: vchiq_arm: use one DMA device to map and unmap bulk pagelists See: raspberrypi/linux#7494 kernel: drm/vc4: hdmi: Remove duplicate hotplug helper call See: raspberrypi/linux#7489 kernel: ASoC: hifiberry_studio: change driver name and add support for new soundcards See: raspberrypi/linux#7487 kernel: mmc: Fix MMC request issuing race condition to prevent stall See: raspberrypi/linux#7486 kernel: dmaengine: dw-axi-dmac: Wait for runtime resume before using a channel See: raspberrypi/linux#7484 kernel: overlays: i2c-fan: add compatible for upstream compatibility See: raspberrypi/linux#7483
popcornmix
added a commit
to raspberrypi/rpi-firmware
that referenced
this pull request
Jul 15, 2026
See: raspberrypi/linux#7500 kernel: staging: vchiq_arm: use one DMA device to map and unmap bulk pagelists See: raspberrypi/linux#7494 kernel: drm/vc4: hdmi: Remove duplicate hotplug helper call See: raspberrypi/linux#7489 kernel: ASoC: hifiberry_studio: change driver name and add support for new soundcards See: raspberrypi/linux#7487 kernel: mmc: Fix MMC request issuing race condition to prevent stall See: raspberrypi/linux#7486 kernel: dmaengine: dw-axi-dmac: Wait for runtime resume before using a channel See: raspberrypi/linux#7484 kernel: overlays: i2c-fan: add compatible for upstream compatibility See: raspberrypi/linux#7483
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
vc4_hdmi_handle_hotplug() calls drm_atomic_helper_connector_hdmi_hotplug() twice: once from the downstream commit 7a761a6 ("vc4: Add jack detection to HDMI audio driver") and once from the upstream code it was rebased onto, which gained the same call in commit 34f051a ("drm/vc4: hdmi: Call HDMI hotplug helper on disconnect").
The helper reads the EDID over DDC, so every detect currently performs two full EDID reads and signals the audio jack state twice. Drop the duplicate and keep the call where upstream has it, after the locking comment.
Fixes: 7a761a6 ("vc4: Add jack detection to HDMI audio driver")