Skip to content

Commit 7fb5653

Browse files
committed
drm/i915/hdmi: propagate errors from intel_hdmi_init_connector()
Propagate errors from intel_hdmi_init_connector() to be able to handle them at callers. This is similar to intel_dp_init_connector(). Cc: Sergey Senozhatsky <[email protected]> Cc: Ville Syrjala <[email protected]> Reported-and-tested-by: Sergey Senozhatsky <[email protected]> Closes: https://lore.kernel.org/r/[email protected] Reviewed-by: Sergey Senozhatsky <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/cdaf9e32cc4880c46e120933438c37b4d87be12e.1735568047.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <[email protected]>
1 parent e1980a9 commit 7fb5653

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

drivers/gpu/drm/i915/display/intel_hdmi.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3039,7 +3039,7 @@ void intel_infoframe_init(struct intel_digital_port *dig_port)
30393039
}
30403040
}
30413041

3042-
void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
3042+
bool intel_hdmi_init_connector(struct intel_digital_port *dig_port,
30433043
struct intel_connector *intel_connector)
30443044
{
30453045
struct intel_display *display = to_intel_display(dig_port);
@@ -3056,17 +3056,17 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
30563056
intel_encoder->base.base.id, intel_encoder->base.name);
30573057

30583058
if (DISPLAY_VER(display) < 12 && drm_WARN_ON(dev, port == PORT_A))
3059-
return;
3059+
return false;
30603060

30613061
if (drm_WARN(dev, dig_port->max_lanes < 4,
30623062
"Not enough lanes (%d) for HDMI on [ENCODER:%d:%s]\n",
30633063
dig_port->max_lanes, intel_encoder->base.base.id,
30643064
intel_encoder->base.name))
3065-
return;
3065+
return false;
30663066

30673067
ddc_pin = intel_hdmi_ddc_pin(intel_encoder);
30683068
if (!ddc_pin)
3069-
return;
3069+
return false;
30703070

30713071
drm_connector_init_with_ddc(dev, connector,
30723072
&intel_hdmi_connector_funcs,
@@ -3111,6 +3111,8 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
31113111
&conn_info);
31123112
if (!intel_hdmi->cec_notifier)
31133113
drm_dbg_kms(display->drm, "CEC notifier get failed\n");
3114+
3115+
return true;
31143116
}
31153117

31163118
/*

drivers/gpu/drm/i915/display/intel_hdmi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ struct intel_encoder;
2222
struct intel_hdmi;
2323
union hdmi_infoframe;
2424

25-
void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
25+
bool intel_hdmi_init_connector(struct intel_digital_port *dig_port,
2626
struct intel_connector *intel_connector);
2727
bool intel_hdmi_compute_has_hdmi_sink(struct intel_encoder *encoder,
2828
const struct intel_crtc_state *crtc_state,

0 commit comments

Comments
 (0)