From: Imre Deak <imre.deak@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: Khaled Almahallawy <khaled.almahallawy@intel.com>,
Arun R Murthy <arun.r.murthy@intel.com>,
Suraj Kandpal <suraj.kandpal@intel.com>
Subject: [PATCH v2] drm/i915/dp_mst: Fix getting display pointer in intel_dp_mst_compute_min_hblank()
Date: Thu, 6 Feb 2025 02:17:26 +0200 [thread overview]
Message-ID: <20250206001726.3021787-1-imre.deak@intel.com> (raw)
In-Reply-To: <20250205232855.3017421-1-imre.deak@intel.com>
The MST intel_connector::encoder pointer is NULL if the connector hasn't
been enabled before, so it can't be used to retrieve the display
pointer. Use instead the crtc_state and drop the unused connector
parameter.
v2: Use the crtc_state and drop the unused connector parameter.
Fixes: a5ebe00c2ace ("drm/i915/dp: Guarantee a minimum HBlank time")
Reported-and-tested-by: Khaled Almahallawy <khaled.almahallawy@intel.com>
Closes: https://lore.kernel.org/all/16754ee4cd21d99c1e81c5953134b496dd07630f.camel@intel.com
Reviewed-by: Khaled Almahallawy <khaled.almahallawy@intel.com> #v1
Cc: Arun R Murthy <arun.r.murthy@intel.com>
Cc: Suraj Kandpal <suraj.kandpal@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index f58d56a1ea03a..ae2db983eff92 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -210,11 +210,9 @@ static int intel_dp_mst_dsc_get_slice_count(const struct intel_connector *connec
}
static void intel_dp_mst_compute_min_hblank(struct intel_crtc_state *crtc_state,
- struct intel_connector *connector,
int bpp_x16)
{
- struct intel_encoder *encoder = connector->encoder;
- struct intel_display *display = to_intel_display(encoder);
+ struct intel_display *display = to_intel_display(crtc_state);
const struct drm_display_mode *adjusted_mode =
&crtc_state->hw.adjusted_mode;
int symbol_size = intel_dp_is_uhbr(crtc_state) ? 32 : 8;
@@ -301,7 +299,7 @@ int intel_dp_mtp_tu_compute_config(struct intel_dp *intel_dp,
local_bw_overhead = intel_dp_mst_bw_overhead(crtc_state,
false, dsc_slice_count, link_bpp_x16);
- intel_dp_mst_compute_min_hblank(crtc_state, connector, link_bpp_x16);
+ intel_dp_mst_compute_min_hblank(crtc_state, link_bpp_x16);
intel_dp_mst_compute_m_n(crtc_state,
local_bw_overhead,
--
2.44.2
next prev parent reply other threads:[~2025-02-06 0:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-05 23:28 [PATCH] drm/i915/dp_mst: Fix getting display pointer in intel_dp_mst_compute_min_hblank() Imre Deak
2025-02-05 23:41 ` Almahallawy, Khaled
2025-02-05 23:57 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2025-02-06 0:17 ` Imre Deak [this message]
2025-02-06 1:23 ` ✓ CI.Patch_applied: success " Patchwork
2025-02-06 1:23 ` ✓ CI.checkpatch: " Patchwork
2025-02-06 1:24 ` ✓ CI.KUnit: " Patchwork
2025-02-06 1:41 ` ✓ CI.Build: " Patchwork
2025-02-06 1:43 ` ✓ CI.Hooks: " Patchwork
2025-02-06 1:44 ` ✓ CI.checksparse: " Patchwork
2025-02-06 2:04 ` ✗ Xe.CI.BAT: failure " Patchwork
2025-02-06 2:57 ` ✗ Xe.CI.Full: " Patchwork
2025-02-06 14:59 ` ✓ i915.CI.BAT: success " Patchwork
2025-02-06 15:06 ` ✓ i915.CI.BAT: success for drm/i915/dp_mst: Fix getting display pointer in intel_dp_mst_compute_min_hblank() (rev2) Patchwork
2025-02-06 16:43 ` Imre Deak
2025-02-06 19:49 ` ✓ 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=20250206001726.3021787-1-imre.deak@intel.com \
--to=imre.deak@intel.com \
--cc=arun.r.murthy@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=khaled.almahallawy@intel.com \
--cc=suraj.kandpal@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.