From: Jani Nikula <jani.nikula@linux.intel.com>
To: "Vodapalli, Ravi Kumar" <ravi.kumar.vodapalli@intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [CI v3 2/6] drm/i915/hdmi: propagate errors from intel_hdmi_init_connector()
Date: Tue, 31 Dec 2024 00:33:13 +0200 [thread overview]
Message-ID: <87v7v0ol7a.fsf@intel.com> (raw)
In-Reply-To: <dff52871-dcf9-4725-b95b-ae44badd4faa@intel.com>
On Tue, 31 Dec 2024, "Vodapalli, Ravi Kumar" <ravi.kumar.vodapalli@intel.com> wrote:
> On 12/30/2024 7:44 PM, Jani Nikula wrote:
>> 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 <senozhatsky@chromium.org>
>> Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
>> Reported-and-tested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
>> Closes: https://lore.kernel.org/r/20241031105145.2140590-1-senozhatsky@chromium.org
>> Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/display/intel_hdmi.c | 10 ++++++----
>> drivers/gpu/drm/i915/display/intel_hdmi.h | 2 +-
>> 2 files changed, 7 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
>> index f7b1768b279c..ed29dd0ccef0 100644
>> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
>> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
>> @@ -3039,7 +3039,7 @@ void intel_infoframe_init(struct intel_digital_port *dig_port)
>> }
>> }
>>
>> -void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
>> +bool intel_hdmi_init_connector(struct intel_digital_port *dig_port,
>> struct intel_connector *intel_connector)
>> {
>> struct intel_display *display = to_intel_display(dig_port);
>> @@ -3056,17 +3056,17 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
>> intel_encoder->base.base.id, intel_encoder->base.name);
>>
>> if (DISPLAY_VER(display) < 12 && drm_WARN_ON(dev, port == PORT_A))
>> - return;
>> + return false;
>>
>> if (drm_WARN(dev, dig_port->max_lanes < 4,
>> "Not enough lanes (%d) for HDMI on [ENCODER:%d:%s]\n",
>> dig_port->max_lanes, intel_encoder->base.base.id,
>> intel_encoder->base.name))
>> - return;
>> + return false;
>>
>> ddc_pin = intel_hdmi_ddc_pin(intel_encoder);
>> if (!ddc_pin)
>> - return;
>> + return false;
>>
>> drm_connector_init_with_ddc(dev, connector,
>> &intel_hdmi_connector_funcs,
>
> drm_connector_init_with_ddc() function has return values, these should
> also be handled here.
It's going to need to be a separate patch.
BR,
Jani.
>
>> @@ -3111,6 +3111,8 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
>> &conn_info);
>> if (!intel_hdmi->cec_notifier)
>> drm_dbg_kms(display->drm, "CEC notifier get failed\n");
>> +
>> + return true;
>> }
>>
>> /*
>> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
>> index 466f48df8a74..38deaeb302a2 100644
>> --- a/drivers/gpu/drm/i915/display/intel_hdmi.h
>> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
>> @@ -22,7 +22,7 @@ struct intel_encoder;
>> struct intel_hdmi;
>> union hdmi_infoframe;
>>
>> -void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
>> +bool intel_hdmi_init_connector(struct intel_digital_port *dig_port,
>> struct intel_connector *intel_connector);
>> bool intel_hdmi_compute_has_hdmi_sink(struct intel_encoder *encoder,
>> const struct intel_crtc_state *crtc_state,
>
--
Jani Nikula, Intel
next prev parent reply other threads:[~2024-12-30 22:33 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-30 14:14 [CI v3 0/6] drm/i915/display: handle hdmi connector init failures, and no HDMI/DP cases Jani Nikula
2024-12-30 14:14 ` [CI v3 1/6] drm/i915/ddi: change intel_ddi_init_{dp, hdmi}_connector() return type Jani Nikula
2024-12-30 14:14 ` [CI v3 2/6] drm/i915/hdmi: propagate errors from intel_hdmi_init_connector() Jani Nikula
2024-12-30 19:21 ` Vodapalli, Ravi Kumar
2024-12-30 22:33 ` Jani Nikula [this message]
2024-12-30 14:14 ` [CI v3 3/6] drm/i915/hdmi: add error handling in g4x_hdmi_init() Jani Nikula
2024-12-30 14:14 ` [CI v3 4/6] drm/i915/ddi: gracefully handle errors from intel_ddi_init_hdmi_connector() Jani Nikula
2024-12-30 14:14 ` [CI v3 5/6] drm/i915/display: add intel_encoder_is_hdmi() Jani Nikula
2024-12-30 14:14 ` [CI v3 6/6] drm/i915/ddi: only call shutdown hooks for valid encoders Jani Nikula
2024-12-30 14:40 ` ✗ Fi.CI.SPARSE: warning for drm/i915/display: handle hdmi connector init failures, and no HDMI/DP cases (rev4) Patchwork
2024-12-30 14:54 ` ✗ i915.CI.BAT: failure " Patchwork
2024-12-30 16:08 ` ✗ Fi.CI.SPARSE: warning for drm/i915/display: handle hdmi connector init failures, and no HDMI/DP cases (rev5) Patchwork
2024-12-30 16:22 ` ✗ i915.CI.BAT: failure " Patchwork
2024-12-30 17:11 ` ✗ Fi.CI.SPARSE: warning for drm/i915/display: handle hdmi connector init failures, and no HDMI/DP cases (rev6) Patchwork
2024-12-30 17:25 ` ✗ i915.CI.BAT: failure " Patchwork
2024-12-30 22:53 ` ✗ Fi.CI.SPARSE: warning for drm/i915/display: handle hdmi connector init failures, and no HDMI/DP cases (rev7) Patchwork
2024-12-30 23:04 ` ✗ i915.CI.BAT: failure " Patchwork
2025-01-02 11:17 ` Jani Nikula
2025-01-02 13:48 ` Ravali, JupallyX
2025-01-02 12:10 ` ✓ i915.CI.BAT: success " Patchwork
2025-01-02 14:20 ` ✓ i915.CI.Full: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87v7v0ol7a.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ravi.kumar.vodapalli@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox