Enable HDMI 2.0 display modes (e.g. 4K@60Hz) on the Synopsys DW HDMI QP TX controller, as found in Rockchip RK3576 & RK3588 SoCs, by making use of the scrambler infrastructure introduced recently in the DRM core and HDMI display helpers.
The first group of patches wires up the SCDC scrambling feature itself in the DW HDMI QP bridge driver, while improving i2c fault handling, and providing enable/disable HPD PHY ops and a HPD notify helper. The remaining patches cover the Rockchip platform driver and HPD handling: bug fixes, minor cleanups, avoiding spurious HPD IRQ wakeups, masking the RK3576 HPD IRQ in io_init, implementing the enable/disable HPD PHY ops, switching HPD reports to dw_hdmi_qp_hpd_notify() to restrict events to the affected connector, and finally dropping the now-unused .setup_hpd() PHY op. This has been tested on the following boards: * Radxa ROCK 4D (RK3576) - Cristian Ciocaltea * Radxa ROCK 5B (RK3588) - Diederik de Haas, Cristian Ciocaltea * Orange Pi 5 (RK3588S) - Robin Räber * Orange Pi 5 Plus (RK3588) - Maud Spiering, Igor Paunovic * NanoPC-T6 LTS (RK3588) - Diederik de Haas Regards, Cristian Signed-off-by: Cristian Ciocaltea <[email protected]> --- Changes in v12: - Rebased onto latest drm-misc-next and dropped the now-merged infrastructure patches - Dropped all patches unrelated to dw-hdmi-qp: the vc4 and the other bridge changes have been already submitted as separate series, while the remaining kunit & final cleanup will follow - Replaced patch "dw-hdmi-qp: Rate limit i2c read error messages" with "drm/bridge: dw-hdmi-qp: Demote i2c bus error messages to debug level" - Updated "drm/bridge: dw-hdmi-qp: Provide dw_hdmi_qp_hpd_notify() helper", according to Maxime's review: hold a reference on the curr_conn connector while the bridge is enabled, take a temporary one in dw_hdmi_qp_hpd_notify(), and guard curr_conn with a mutex instead of READ_ONCE()/WRITE_ONCE() - Collected Tested-by tags from Robin and Igor - Link to v11: https://patch.msgid.link/[email protected] Changes in v11: - Collected R-b tags from Maxime and Heiko - Restored connector status before -EDEADLK handling of drm_helper_probe_single_connector_modes() in "drm/probe-helper: Introduce .force_ctx() connector callback" (Sashiko) - Improved "drm/connector: Add HDMI 2.0 scrambler infrastructure": * Constified drm_connector_hdmi_scrambler_supported()'s argument * Separated the checks for default tmds rates and the scrambler callbacks presence (Maxime) * Reworked drm_connector_hdmi_scrambler_supported() to rely exclusively on supported_hdmi_ver, and drop drmm_connector_hdmi_init()'s check for scrambler_{enable,disable} callbacks presence in non-HDMI2.0 cases - Checked for connector->ddc before calling SCDC helpers from drm_connector_hdmi_disable_scrambling(), in "drm/display: hdmi: Add HDMI 2.0 scrambling management helpers" (Sashiko) - Moved "drm/display: bridge_connector: Switch to .force_ctx() connector helper" patch after the one introducing drm_atomic_helper_connector_hdmi_force_ctx() to fix a build issue - Added new patch "drm/bridge: Fix NULL deref in drm_bridge_add() for legacy bridges" (Sashiko) - Split "drm/display: hdmi-state-helper: Pass acquire ctx to hotplug helpers" into "drm/display: hdmi-state-helper: Add drm_atomic_helper_connector_hdmi_force_ctx()" (Maxime) - Improved drm_atomic_helper_connector_hdmi_update()'s error handling in "drm/display: hdmi-state-helper: Sync SCDC state on hotplug" (Maxime) - Reordered cancel_delayed_work_sync() and dw_hdmi_qp_suspend() in dw_hdmi_qp_rockchip_suspend() and prevented I2C timeouts and bus hangs during system suspend, part of "drm/rockchip: dw_hdmi_qp: Cancel pending HPD work on suspend" (Sashiko) - Canceled an already queued hdmi->hpd_work after disabling the HPD IRQ and thus preventing any spurious HPD events in "drm/rockchip: dw_hdmi_qp: Control the HPD IRQ line via the bridge HPD ops" (Sashiko) - Ignored failures when the scrambler hooks try to acquire the drm device, in "drm/vc4: hdmi: Convert to common HDMI 2.0 scrambling infrastructure" (Maxime) - Moved the comment describing the vendor/product strings to the correct position in "drm/sun4i: hdmi: Convert to drmm_connector_hdmi_init()" (Sashiko) - Updated "drm/connector: Drop redundant hdmi vendor/product fields" description to indicate the connector registration tests used to verify the zero-padded product/vendor fields will be covered by the SPD InfoFrame tests - Provided a parameterized test for the missing scrambler callbacks and drop the now redundant tests in "drm/tests: connector: Add HDMI source-side scrambler coverage" - Added new patches to consolidate SPD InfoFrame handling of vendor/product: * video/hdmi: Define SPD InfoFrame field lengths and use strtomem_pad() * drm/connector: Use the SPD InfoFrame field length defines * drm/tests: hdmi: Add SPD InfoFrame vendor/product coverage - Rebased series onto latest drm-misc-next; since the tree now contains a workaround for the broken EL2 virtual timer on bcm2712 SoC, dropped the cover letter note about RPi5 hang during boot - Link to v10: https://patch.msgid.link/[email protected] Changes in v10: - Collected T-b from Diederik on relevant patches - Collected R-b from Dmitry on patch renaming drmm_connector_hdmi_init() - Added new patches to address Sashiko findings: * drm/connector: hdmi: Handle reset() state allocation failure * drm/bridge: Fix unlocked list_del in drm_bridge_add() * drm/bridge: Fix unlocked list access in drm_bridge_attach() * drm/rockchip: dw_hdmi_qp: Cancel pending HPD work on suspend * drm/probe-helper: Introduce .force_ctx() connector callback * drm/display: bridge_connector: Switch to .force_ctx() connector helper * drm/vc4: hdmi: Switch to .force_ctx() connector helper * drm/display: hdmi-state-helper: Drop drm_atomic_helper_connector_hdmi_force() - Updated "drm/connector: Add drmm_connector_hdmi_init() with new signature" to check if the reset callback failed to allocate memory - Updated "drm/display: hdmi-state-helper: Pass acquire ctx to hotplug helpers" to introduce drm_atomic_helper_connector_hdmi_force_ctx() implementation and drop the conflicting local ctx from drm_atomic_helper_connector_hdmi_force() - Updated "drm/display: hdmi: Add HDMI 2.0 scrambling management helpers" to bail early in the work handler on drm_connector_is_unregistered() - Updated "drm/bridge: dw-hdmi-qp: Provide dw_hdmi_qp_hpd_notify() helper" to use READ_ONCE/WRITE_ONCE on hdmi->curr_conn - Reworked "drm/rockchip: dw_hdmi_qp: Fix NULL deref in PM ops on incomplete bind" into "drm/rockchip: dw_hdmi_qp: Fix invalid drvdata access in PM ops" - Fixed "drm/rockchip: rk3066_hdmi: Advertise HDMI 1.4 capabilities" to set the expected HDMI_VERSION_1_4 instead of HDMI_VERSION_1_3 - Fixed all KUnit tests that created a dangling pointer by storing the address of a stack-allocated drm_connector_hdmi_funcs structure into a persistent device-managed object - Fixed flawed logic in "drm/tests: connector: Add HDMI max_tmds_char_rate init coverage" causing a couple of rate limit rejection tests to pass for the wrong reason - Rebased series onto latest drm-misc-next - Link to v9: https://patch.msgid.link/[email protected] Changes in v9: - Collected A-b, R-b, T-b tags from Dmitry, Maxime, Maud - Dropped misleading "HDMI_VERSION_UNKNOWN means legacy/default behaviour" from drm_connector_hdmi_caps.supported_hdmi_ver documentation - Warned in drm_bridge_add() if an HDMI bridge leaves supported_hdmi_ver unset - Added max_tmds_char_rate to drm_bridge struct and wire it through drm_bridge_connector_init() along with supported_hdmi_ver - Got rid of connector's scrambler_supported flag and, instead, relied on checking the presence of scrambler callbacks via a new drm_connector_hdmi_scrambler_supported() helper (Dmitry) - Dropped HDMI connector scdc_cb callback and introduced scdc_work_initialized flag to perform lazy initialization and guard the teardown paths against touching an uninitialized work item - Unconditionally checked connector->hdmi.max_tmds_char_rate in "drm/display: hdmi-state-helper: Add fallback TMDS rate validation" and performed s/fallback/source/ in commit subject & description (Maxime) - Added a TODO comment for checking drm_display_info.hdmi.scdc.scrambling.low_rates in "drm/display: hdmi-state-helper: Set HDMI scrambling requirement" patch (Maxime) - Moved the prototype changes from "drm/display: hdmi-state-helper: Sync SCDC state on hotplug" into a dedicated "drm/display: hdmi-state-helper: Pass acquire ctx to hotplug helpers" patch; also switched ctx and status args ordering, for consistency with detect_ctx() signature (Maxime) - Ensured HDMI connector's SCDC delayed work is explicitly canceled during connector cleanup (Sashiko) - Fixed a potential NULL pointer dereference in drm_connector_hdmi_enable_scrambling() and drm_connector_hdmi_sync_scdc() helpers caused by forcing an EDID advertising SCDC on a connector that physically lacks an I2C DDC bus (Sashiko) - dw-hdmi-qp * Fixed a potential NULL pointer dereference in dw_hdmi_qp_hpd_notify() helper by using a local variable to cache the connector pointer (Sashiko) * Ensured hdmi->phy.ops->disable() is not skipped in dw_hdmi_qp_bridge_atomic_disable() by accessing the connector via drm_atomic_get_old_connector_for_encoder() instead of hdmi->curr_conn (Sashiko) * Mitigated a potential use-after-free reported by Sashiko caused when HPD interrupt fires after the DRM device is torn down; reworked "Defer HPD IRQ enable until after connector setup" into: * Factor out HPD interrupt mask/unmask helpers * Control the HPD IRQ line via the bridge HPD ops * Added new patch addressing another Sashiko finding: drm/rockchip: dw_hdmi_qp: Avoid spurious HPD IRQ thread wakeups * Added new patch: drm/bridge: dw-hdmi-qp: Remove unused workqueue include and define * Dropped .hdmi_tmds_char_rate_valid() usage from the bridge/synopsys/dw-hdmi-qp.c scrambling support patch, while advertising HDMI 1.4 capability for no-hpd configurations - VC4 * Passed ctx instead of NULL when calling drm_atomic_helper_connector_hdmi_hotplug() from vc4_hdmi_handle_hotplug() in the helper preparatory patch * Aligned with the expected detect_ctx() semantics in a dedicated "drm/vc4: hdmi: Propagate -EDEADLK to the top level" rather than bundled in the conversion patch * Optimized diff around drm_dev_enter() in the conversion patch (Maxime) * Simplified vc4_hdmi_connector_clock_valid() logic by deferring max clock validation to HDMI helpers (new patch) - Migrated to a funcs-based HDMI connector init API - new patches: * drm/display: hdmi: Rename drmm_connector_hdmi_init() to *_ini2() * drm/display: bridge_connector: Convert to drmm_connector_hdmi_init() * drm/vc4: hdmi: Convert to drmm_connector_hdmi_init() * drm/vc4: hdmi: Convert to common HDMI 2.0 scrambling infrastructure * drm/sun4i: hdmi: Convert to drmm_connector_hdmi_init() * drm/tests: connector: Convert to drmm_connector_hdmi_init() * drm/tests: hdmi_state_helper: Convert to drmm_connector_hdmi_init() * drm/bridge: adv7511: Advertise HDMI 1.2 capabilities * drm/bridge: inno-hdmi: Advertise HDMI 1.2 capabilities * drm/bridge: ite-it6263: Drop redundant .mode_valid hook * drm/bridge: ite-it6263: Advertise HDMI 1.3 capabilities * drm/bridge: ite-it66121: Advertise HDMI 1.2 capabilities * drm/bridge: lontium-lt9611: Advertise HDMI 1.4 capabilities * drm/rockchip: rk3066_hdmi: Advertise HDMI 1.4 capabilities * drm/sun4i: hdmi: Convert to drmm_connector_hdmi_init() * drm/connector: Remove drmm_connector_hdmi_ini2() * drm/connector: Drop redundant hdmi vendor/product fields * drm/connector: Drop redundant hdmi supported_formats field * drm/connector: Drop redundant max_bpc field - KUnit * Adapted hdmi_state_helper scrambler tests and reworked a couple of max_tmds_char_rate tests according to the latest DRM core changes * Fixed a regression in the HDMI caps-based init coverage * Fix a couple of bisectability issues, also implied partial commit reorder * Set supported HDMI version for the test bridges (new patch) - Rebased series onto latest drm-misc-next and removed "drm/rockchip: dw_hdmi_qp: Drop unnecessary #include" patch, since a similar change as been already applied - Link to v8: https://patch.msgid.link/[email protected] Changes in v8: - Added an enum hdmi_version under video/hdmi to describe the HDMI specification version a source/sink supports (new patch 1) - Introduced HDMI connector capabilities API and reworked the infrastructure patches on top of it: drmm_connector_hdmi_init() now takes a drm_connector_hdmi_caps struct that carries supported_formats, max_bpc, supported_hdmi_ver and max_tmds_char_rate (new patches 2-3) - Moved all the new SCDC helpers covering both source and sink to display/drm_hdmi_helper.c - Renamed drm_scdc_{start,stop}_scrambling() to drm_connector_hdmi_{enable,disable}_scrambling() and added a connector-state argument so the scrambler_needed flag is checked centrally instead of in every driver - Renamed drm_scdc_sync_status() to drm_connector_hdmi_sync_scdc(), aligned its lifecycle with vc4_hdmi_reset_link(), and removed the internal drm_scdc_reset_crtc() helper; it now also gates on CRTC state and an in-flight commit (Maxime) - Changed the prototype of drm_atomic_helper_connector_hdmi_hotplug() to take an acquire context and an int return, instead of adding a new _ctx variant (Maxime) - Added drm_hdmi_mode_needs_scrambling() to centralise the above-340 MHz decision (new patch 7) - Made SCDC source version negotiation optional and moved it to a dedicated patch "drm/display: hdmi: Advertise SCDC source version when scrambling" (new patch 8), backed by a new drm_scdc_set_source_version() helper in "drm/display: scdc-helper: Add helper to set SCDC version information" (new patch 6) - Added a fallback TMDS rate validation patch using the connector-level max_tmds_char_rate when the driver provides no .tmds_char_rate_valid() hook (new patch 9) - Split scrambler_needed flag handling into its own hdmi-state-helper dedicate change (new patch 11) - VC4: * Replaced vc4_hdmi_mode_needs_scrambling() with drm_hdmi_mode_needs_scrambling() (new patch 30) * Restored drm_dev_{enter,exit}() pairing around the converted scrambling paths * Removed now unused output_{bpc,color_format} fields from vc4_hdmi as part of the SCDC conversion - KUnit: * Covered the caps-based connector init path: NULL caps, inferred max_tmds_char_rate per supported_hdmi_ver, and override validation (new patch 32) * Switched drm_hdmi_state_helper_test to the caps-based init helper and exposed it through drm_kunit_helper_connector_hdmi_init_with_caps_edid_funcs() (new patch 34) * Added max_tmds_char_rate fallback coverage in drm_hdmi_state_helper_test (new patch 35) - Rebased onto latest drm-misc-next and dropped the already applied "drm/fb-helper: Remove unused local variable in hotplug_event()" patch - Link to v7: https://patch.msgid.link/[email protected] Changes in v7: - Split the scrambler_needed flag computation from the SCDC scrambling helpers into a standalone hdmi_state_helper patch for clarity (new patch 6) - Added vc4 HDMI conversion to common TMDS char rate constants and SCDC scrambling helpers as a proof of reuse (new patches 24-25) - Added KUnit tests for connector scrambler_supported/callback consistency validation (new patch 26) - Added 4K@60Hz 600MHz TMDS test EDID for high-rate scrambling coverage (new patch 27) - Added KUnit tests for hdmi_state_helper scrambler_needed flag: low-rate, high-rate, and source-no-support cases (new patch 28) - Fixed EDID conformity issues (edid-decode v1.33.0 failures) in the existing 1080p+4K YUV420 200MHz and 4K RGB/YUV 340MHz test EDIDs without changing the capabilities used by existing tests (new patches 29-30) - Rebased onto latest drm-misc-next - Link to v6: https://patch.msgid.link/[email protected] Changes in v6: - Collected R-b & A-b tags from Dmitry and Heiko - Restructured the series from 10 into 22 patches, splitting the SCDC scrambling helpers, connector infrastructure, bridge operations, bridge_connector plumbing, dw-hdmi-qp implementation, and Rockchip platform changes into distinct commits - Added drm_scdc_dbg() macro to simplify debug messages (new patch) - Added drm_scdc_start/stop/sync_status() helpers for full scrambling lifecycle management (reworked from v5 patch 5) - Added drm_atomic_helper_connector_hdmi_hotplug_ctx() to propagate modeset acquire context for SCDC sync on hotplug (new patch) - Added connector scrambler callbacks and SCDC work/flag infrastructure as a separate patch (split from v5 patch 5) - Added DRM_BRIDGE_OP_HDMI_SCRAMBLER bridge operation with hdmi_scrambler_enable/disable callbacks (new patch) - Implemented bridge_connector scrambler interface wiring (new patch) - Added .enable_hpd()/.disable_hpd() PHY ops for dw-hdmi-qp bridge and Rockchip platform drivers, replacing the obsolete .setup_hpd() op - Added dw_hdmi_qp_hpd_notify() helper for targeted connector-only HPD notification (split from v5 patch 10) - Dropped drm_fb_helper_hotplug_event() unused variable (new cleanup) - Dropped unused drm_simple_kms_helper.h include (new cleanup) - Masked RK3576 HPD IRQ in io_init() for consistency with RK3588 - Rebased onto latest drm-misc-next - Link to v5: https://patch.msgid.link/[email protected] Changes in v5: - Added new patches: 1/10, 3/10, 6/10, 7/10, 8/10 - Removed redundant no-op error check in drm_bridge_helper_reset_crtc() (patch 1) - Removed the EDEADLK retry loop from the bridge .detect_ctx() callback, as that's already handled in the drm_bridge_detect_ctx() helper or by the caller when ctx is provided (patch 2) - Refactored drm_bridge_detect() to delegate to drm_bridge_detect_ctx() and added a WARN_ON for unexpected negative return values (patch 2) - Split the bridge-connector .detect_ctx() switch into a preparatory patch to use cached connector status in .get_modes() (patch 3) - Improved error handling in SCDC scrambling setup: roll back high TMDS clock ratio on scrambling failure, reset scramb_enabled flag on set_scramb failure, and add SCDC version read/write error checks (patch 5) - Annotated scramb_enabled with READ_ONCE/WRITE_ONCE for cross-context access between modeset paths and the scrambling work item (patch 5) - Renamed SCDC_MIN_SOURCE_VERSION to SCDC_MAX_SOURCE_VERSION (patch 5) - Rate limited i2c error messages (patch 6) - Added missing newlines in dev_err_probe() messages (patch 7) - Replaced indirect device pointer accesses with local dev variable in bind() (patch 8) - Split the HPD connector restriction (formerly patch 4/4): register HPD IRQ after connector setup first (patch 9), then restrict HPD event to the affected connector (patch 10); also collected R-b from Heiko - Rebased onto latest drm-misc-next - Link to v4: https://lore.kernel.org/r/[email protected] Changes in v4: - Fixed conflicts while rebasing onto latest drm-misc-next - Link to v3: https://lore.kernel.org/r/[email protected] Changes in v3: - Used drm_bridge_helper_reset_crtc() helper to reset the display pipeline and got rid of some boilerplate code (Maxime) - Rebased onto latest drm-misc-next - Link to v2: https://lore.kernel.org/r/[email protected] Changes in v2: - Collected Tested-by tags from Diederik and Maud - Rebased onto latest drm-misc-next - Ensured the recently introduced 'no-hpd' support for dealing with unconnected/repurposed/broken HPD pin is limited to HDMI 1.4 rates - Link to v1: https://lore.kernel.org/r/[email protected] --- Cristian Ciocaltea (16): drm/bridge: dw-hdmi-qp: Demote i2c bus error messages to debug level drm/bridge: dw-hdmi-qp: Provide .{enable,disable}_hpd() PHY ops drm/bridge: dw-hdmi-qp: Remove unused workqueue include and define drm/bridge: dw-hdmi-qp: Add HDMI 2.0 scrambling support drm/bridge: dw-hdmi-qp: Provide dw_hdmi_qp_hpd_notify() helper drm/rockchip: dw_hdmi_qp: Fix invalid drvdata access in PM ops drm/rockchip: dw_hdmi_qp: Cancel pending HPD work on suspend drm/rockchip: dw_hdmi_qp: Add missing newlines in dev_err_probe() messages drm/rockchip: dw_hdmi_qp: Use local dev variable consistently in bind() drm/rockchip: dw_hdmi_qp: Avoid spurious HPD IRQ thread wakeups drm/rockchip: dw_hdmi_qp: Mask RK3576 HPD IRQ in io_init drm/rockchip: dw_hdmi_qp: Implement .{enable,disable}_hpd() PHY ops drm/rockchip: dw_hdmi_qp: Factor out HPD interrupt (un)mask helpers drm/rockchip: dw_hdmi_qp: Control the HPD IRQ line via the bridge HPD ops drm/rockchip: dw_hdmi_qp: Use dw_hdmi_qp_hpd_notify() for HPD reports drm/bridge: dw-hdmi-qp: Drop unused .setup_hpd() phy op drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 159 ++++++++++++++----- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 205 +++++++++++++++---------- include/drm/bridge/dw_hdmi_qp.h | 4 +- 3 files changed, 248 insertions(+), 120 deletions(-) --- base-commit: 37b346eab23aead52d17a8fa687056bfc651a416 change-id: 20251203-dw-hdmi-qp-scramb-cdbd8b57ccf9
