From: Sergey Senozhatsky <senozhatsky@chromium.org>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org,
Sergey Senozhatsky <senozhatsky@chromium.org>,
Ville Syrjala <ville.syrjala@linux.intel.com>
Subject: Re: [PATCH 0/3] drm/i915/display: handle hdmi connector init failures
Date: Fri, 15 Nov 2024 14:00:45 +0900 [thread overview]
Message-ID: <20241115050045.GM1458936@google.com> (raw)
In-Reply-To: <cover.1731599468.git.jani.nikula@intel.com>
On (24/11/14 17:52), Jani Nikula wrote:
> This is an attempt to resolve [1].
>
> [1] https://lore.kernel.org/r/20241031105145.2140590-1-senozhatsky@chromium.org
>
> Jani Nikula (3):
> drm/i915/hdmi: propagate errors from intel_hdmi_init_connector()
> drm/i915/hdmi: add error handling in g4x_hdmi_init()
> drm/i915/ddi: propagate errors from intel_ddi_init_hdmi_connector()
So these look reasonable and good to me, and I think landing them
makes a lot of sense. For that part feel free to add:
Reported-and-tested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
and FWIW
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Now, regarding the issue in question - we are getting there, but not
quite there yet.
I'm still seeing multiple NULL-ptr derefs, namely on
DDI A/PHY A
DDI TC1/PHY TC1
DDI TC2/PHY TC2
DDI TC3/PHY TC3
DDI TC4/PHY TC4
The thing is, all of them are DP connectors, we only ever call
intel_ddi_init_dp_connector() on them, so dig_port->hdmi
is not init-ed, wheres intel_hdmi_encoder_shutdown() doesn't
distinguish and treats everyone as HDMI connector, dereferencing
->hdmi.
With the small addition I don't see null-ptr derefs anymore:
---
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 1abf080b4a20..0c6bb378b708 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -2377,6 +2377,11 @@ void intel_hdmi_encoder_shutdown(struct intel_encoder *encoder)
{
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
+ if (intel_encoder_is_dp(encoder)) {
+ pr_err(":: oops another day ::\n");
+ return;
+ }
+
/*
* Give a hand to buggy BIOSen which forget to turn
* the TMDS output buffers back on after a reboot.
next prev parent reply other threads:[~2024-11-15 5:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-14 15:52 [PATCH 0/3] drm/i915/display: handle hdmi connector init failures Jani Nikula
2024-11-14 15:52 ` [PATCH 1/3] drm/i915/hdmi: propagate errors from intel_hdmi_init_connector() Jani Nikula
2024-11-14 15:52 ` [PATCH 2/3] drm/i915/hdmi: add error handling in g4x_hdmi_init() Jani Nikula
2024-11-14 15:52 ` [PATCH 3/3] drm/i915/ddi: propagate errors from intel_ddi_init_hdmi_connector() Jani Nikula
2024-11-14 18:29 ` ✓ CI.Patch_applied: success for drm/i915/display: handle hdmi connector init failures Patchwork
2024-11-14 18:30 ` ✗ CI.checkpatch: warning " Patchwork
2024-11-14 18:31 ` ✓ CI.KUnit: success " Patchwork
2024-11-14 18:43 ` ✓ CI.Build: " Patchwork
2024-11-14 18:45 ` ✓ CI.Hooks: " Patchwork
2024-11-14 18:46 ` ✗ CI.checksparse: warning " Patchwork
2024-11-14 19:15 ` ✓ CI.BAT: success " Patchwork
2024-11-15 5:00 ` Sergey Senozhatsky [this message]
2024-12-03 12:31 ` [PATCH 0/3] " Sergey Senozhatsky
2024-12-04 15:08 ` Jani Nikula
2024-11-15 12:53 ` ✗ CI.FULL: failure for " 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=20241115050045.GM1458936@google.com \
--to=senozhatsky@chromium.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=ville.syrjala@linux.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;
as well as URLs for NNTP newsgroup(s).