From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: imre.deak@intel.com, animesh.manna@intel.com,
"Jouni Högander" <jouni.hogander@intel.com>
Subject: [PATCH v2 1/4] drm/i915/display: Handle MST connector in intel_attached_dp
Date: Fri, 6 Sep 2024 10:00:30 +0300 [thread overview]
Message-ID: <20240906070033.289015-2-jouni.hogander@intel.com> (raw)
In-Reply-To: <20240906070033.289015-1-jouni.hogander@intel.com>
Connector->encoder might be null for MST connector. Take this into account
in intel_attached_dp.
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_display_types.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 733de5edcfdb3..000ab373c8879 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1913,7 +1913,10 @@ static inline struct intel_dp *enc_to_intel_dp(struct intel_encoder *encoder)
static inline struct intel_dp *intel_attached_dp(struct intel_connector *connector)
{
- return enc_to_intel_dp(intel_attached_encoder(connector));
+ if (connector->mst_port)
+ return connector->mst_port;
+ else
+ return enc_to_intel_dp(intel_attached_encoder(connector));
}
static inline bool intel_encoder_is_dp(struct intel_encoder *encoder)
--
2.34.1
next prev parent reply other threads:[~2024-09-06 7:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-06 7:00 [PATCH v2 0/4] DP2.1 Panel Replay Fixes Jouni Högander
2024-09-06 7:00 ` Jouni Högander [this message]
2024-09-06 10:51 ` [PATCH v2 1/4] drm/i915/display: Handle MST connector in intel_attached_dp Imre Deak
2024-09-06 7:00 ` [PATCH v2 2/4] drm/i915/display: Use intel_attached_dp instead of local implementation Jouni Högander
2024-09-06 10:51 ` Imre Deak
2024-09-06 7:00 ` [PATCH v2 3/4] drm/i915/psr: Add connector debugfs files for MST connector as well Jouni Högander
2024-09-06 7:00 ` [PATCH v2 4/4] drm/i915/psr: Do not wait for PSR being idle on on Panel Replay Jouni Högander
2024-09-10 7:24 ` Manna, Animesh
2024-09-11 10:04 ` Hogander, Jouni
2024-09-06 8:01 ` ✗ Fi.CI.SPARSE: warning for DP2.1 Panel Replay Fixes (rev2) Patchwork
2024-09-06 8:21 ` ✗ Fi.CI.BAT: failure " Patchwork
2024-09-09 5:13 ` ✓ Fi.CI.BAT: success " Patchwork
2024-09-10 16:50 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-09-11 9:30 ` Hogander, Jouni
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=20240906070033.289015-2-jouni.hogander@intel.com \
--to=jouni.hogander@intel.com \
--cc=animesh.manna@intel.com \
--cc=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