From: Imre Deak <imre.deak@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 1/2] drm/i915: Prevent HW access during init from SDVO TV get_modes hook
Date: Tue, 6 Feb 2024 17:39:09 +0200 [thread overview]
Message-ID: <20240206153910.1758057-2-imre.deak@intel.com> (raw)
In-Reply-To: <20240206153910.1758057-1-imre.deak@intel.com>
Prevent accessing the HW from the SDVO/TV get_modes connector hook.
Returning 0 from the hook will make the caller -
drm_helper_probe_single_connector_modes() - keep the previously detected
mode list of the connector.
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 2571ef5a1b211..ccea0efbd136f 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2287,6 +2287,7 @@ static const struct drm_display_mode sdvo_tv_modes[] = {
static int intel_sdvo_get_tv_modes(struct drm_connector *connector)
{
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(to_intel_connector(connector));
+ struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev);
struct intel_sdvo_connector *intel_sdvo_connector =
to_intel_sdvo_connector(connector);
const struct drm_connector_state *conn_state = connector->state;
@@ -2298,6 +2299,9 @@ static int intel_sdvo_get_tv_modes(struct drm_connector *connector)
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
connector->base.id, connector->name);
+ if (!intel_display_driver_check_access(i915))
+ return 0;
+
/*
* Read the list of supported input resolutions for the selected TV
* format.
--
2.39.2
next prev parent reply other threads:[~2024-02-06 15:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-06 15:39 [PATCH 0/2] drm/i915: Prevent HW access during init from connector hooks Imre Deak
2024-02-06 15:39 ` Imre Deak [this message]
2024-02-07 13:26 ` [PATCH 1/2] drm/i915: Prevent HW access during init from SDVO TV get_modes hook Hogander, Jouni
2024-02-07 13:45 ` Hogander, Jouni
2024-02-07 14:10 ` Imre Deak
2024-02-07 15:49 ` Imre Deak
2024-02-07 14:16 ` Imre Deak
2024-02-07 15:35 ` Hogander, Jouni
2024-02-08 11:18 ` [PATCH v2 " Imre Deak
2024-02-06 15:39 ` [PATCH 2/2] drm/i915: Prevent HW access during init from connector get_modes hooks Imre Deak
2024-02-07 15:36 ` Hogander, Jouni
2024-02-06 17:01 ` ✓ Fi.CI.BAT: success for drm/i915: Prevent HW access during init from connector hooks Patchwork
2024-02-06 20:18 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-02-08 19:26 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Prevent HW access during init from connector hooks (rev2) Patchwork
2024-02-08 19:40 ` ✓ Fi.CI.BAT: success " Patchwork
2024-02-08 23:36 ` ✓ Fi.CI.IGT: " 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=20240206153910.1758057-2-imre.deak@intel.com \
--to=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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