Re: [PATCH v8 10/39] drm/display: hdmi-state-helper: Sync SCDC state on hotplug

[Maxime Ripard <mripard@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 2611 bytes --]

On Wed, Jul 08, 2026 at 02:21:11PM +0300, Cristian Ciocaltea wrote:
> >> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
> >> ---
> >>  drivers/gpu/drm/display/drm_bridge_connector.c  |  3 ++-
> >>  drivers/gpu/drm/display/drm_hdmi_state_helper.c | 28 +++++++++++++++++--------
> >>  drivers/gpu/drm/vc4/vc4_hdmi.c                  |  2 +-
> >>  include/drm/display/drm_hdmi_state_helper.h     |  6 ++++--
> >>  4 files changed, 26 insertions(+), 13 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c
> >> index 796069dbf1a1..46104506fe32 100644
> >> --- a/drivers/gpu/drm/display/drm_bridge_connector.c
> >> +++ b/drivers/gpu/drm/display/drm_bridge_connector.c
> >> @@ -221,7 +221,8 @@ drm_bridge_connector_detect(struct drm_connector *connector, bool force)
> >>  		status = detect->funcs->detect(detect, connector);
> >>  
> >>  		if (hdmi)
> >> -			drm_atomic_helper_connector_hdmi_hotplug(connector, status);
> >> +			drm_atomic_helper_connector_hdmi_hotplug(connector, status,
> >> +								 NULL);
> >>  
> >>  		drm_bridge_connector_hpd_notify(connector, status);
> >>  	} else {
> > 
> > We should move this one to detect_ctx to get the ctx passed and avoid
> > passing NULL here.
> 
> We do this in patch 15.  Should I try to reorder?

Yes, it would make this part more obvious

[...]

> >>  EXPORT_SYMBOL(drm_atomic_helper_connector_hdmi_force);
> >> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> >> index 74dce4be0c00..e165f604939b 100644
> >> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> >> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> >> @@ -375,7 +375,7 @@ static void vc4_hdmi_handle_hotplug(struct vc4_hdmi *vc4_hdmi,
> >>  	 * the lock for now.
> >>  	 */
> >>  
> >> -	drm_atomic_helper_connector_hdmi_hotplug(connector, status);
> >> +	drm_atomic_helper_connector_hdmi_hotplug(connector, status, NULL);
> > 
> > vc4_hdmi_handle_hotplug has the context passed as an argument, we should reuse it.
> 
> The vc4 conversion (patch 31) removes vc4_hdmi_handle_hotplug() and calls
> drm_atomic_helper_connector_hdmi_hotplug() directly in
> vc4_hdmi_connector_detect_ctx().  
> 
> I used NULL here to ensure there wouldn't be any race between the two separate
> SCDC state management implementations, but that can't happen at this point
> anyway (hdmi->scrambler_enabled isn't set by the driver).  So we can pass the
> context if you prefer.

We still need this to be bisectable, so yeah, please do.

Thanks!
Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 273 bytes --]