Use drm_atomic_helper_connector_hdmi_force_ctx() as the .force_ctx() implementation, so that the acquire context created by the probe helper reaches the HDMI connector framework.
This is a prerequisite for converting the driver to the common HDMI 2.0 scrambling infrastructure, which implicitly handles SCDC state recovery through a CRTC reset when the sink reconnects while the display pipeline is active. Note that this does not interfere with the local SCDC state-management implementation, since the driver's scrambler capability has not yet been exposed through the common helpers. Signed-off-by: Cristian Ciocaltea <[email protected]> --- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 4f7fc6689869..ba16e7944cf3 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -504,7 +504,6 @@ static void vc4_hdmi_connector_reset(struct drm_connector *connector) } static const struct drm_connector_funcs vc4_hdmi_connector_funcs = { - .force = drm_atomic_helper_connector_hdmi_force, .fill_modes = drm_helper_probe_single_connector_modes, .reset = vc4_hdmi_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, @@ -513,6 +512,7 @@ static const struct drm_connector_funcs vc4_hdmi_connector_funcs = { static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs = { .detect_ctx = vc4_hdmi_connector_detect_ctx, + .force_ctx = drm_atomic_helper_connector_hdmi_force_ctx, .get_modes = vc4_hdmi_connector_get_modes, .atomic_check = vc4_hdmi_connector_atomic_check, .mode_valid = drm_hdmi_connector_mode_valid, -- 2.55.0
