Commit 165ba1aa authored by Maxime Ripard's avatar Maxime Ripard

drm/vc4: hdmi: Switch to detect_ctx

We'll need the locking context in future patch, so let's convert .detect
to .detect_ctx.
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220829134731.213478-6-maxime@cerno.tech
parent c0895f80
...@@ -306,8 +306,9 @@ static void vc4_hdmi_handle_hotplug(struct vc4_hdmi *vc4_hdmi, ...@@ -306,8 +306,9 @@ static void vc4_hdmi_handle_hotplug(struct vc4_hdmi *vc4_hdmi,
vc4_hdmi_enable_scrambling(&vc4_hdmi->encoder.base.base); vc4_hdmi_enable_scrambling(&vc4_hdmi->encoder.base.base);
} }
static enum drm_connector_status static int vc4_hdmi_connector_detect_ctx(struct drm_connector *connector,
vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) struct drm_modeset_acquire_ctx *ctx,
bool force)
{ {
struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector); struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector);
enum drm_connector_status status = connector_status_disconnected; enum drm_connector_status status = connector_status_disconnected;
...@@ -449,7 +450,6 @@ vc4_hdmi_connector_duplicate_state(struct drm_connector *connector) ...@@ -449,7 +450,6 @@ vc4_hdmi_connector_duplicate_state(struct drm_connector *connector)
} }
static const struct drm_connector_funcs vc4_hdmi_connector_funcs = { static const struct drm_connector_funcs vc4_hdmi_connector_funcs = {
.detect = vc4_hdmi_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes, .fill_modes = drm_helper_probe_single_connector_modes,
.reset = vc4_hdmi_connector_reset, .reset = vc4_hdmi_connector_reset,
.atomic_duplicate_state = vc4_hdmi_connector_duplicate_state, .atomic_duplicate_state = vc4_hdmi_connector_duplicate_state,
...@@ -457,6 +457,7 @@ static const struct drm_connector_funcs vc4_hdmi_connector_funcs = { ...@@ -457,6 +457,7 @@ static const struct drm_connector_funcs vc4_hdmi_connector_funcs = {
}; };
static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs = { static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs = {
.detect_ctx = vc4_hdmi_connector_detect_ctx,
.get_modes = vc4_hdmi_connector_get_modes, .get_modes = vc4_hdmi_connector_get_modes,
.atomic_check = vc4_hdmi_connector_atomic_check, .atomic_check = vc4_hdmi_connector_atomic_check,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment