Skip to content

Commit 93ecd4f

Browse files
committed
drm/i915/dp_mst: Fix getting display pointer in intel_dp_mst_compute_min_hblank()
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: a5ebe00 ("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> Link: https://patchwork.freedesktop.org/patch/msgid/20250206001726.3021787-1-imre.deak@intel.com
1 parent badff5f commit 93ecd4f

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/gpu/drm/i915/display/intel_dp_mst.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,9 @@ static int intel_dp_mst_dsc_get_slice_count(const struct intel_connector *connec
210210
}
211211

212212
static void intel_dp_mst_compute_min_hblank(struct intel_crtc_state *crtc_state,
213-
struct intel_connector *connector,
214213
int bpp_x16)
215214
{
216-
struct intel_encoder *encoder = connector->encoder;
217-
struct intel_display *display = to_intel_display(encoder);
215+
struct intel_display *display = to_intel_display(crtc_state);
218216
const struct drm_display_mode *adjusted_mode =
219217
&crtc_state->hw.adjusted_mode;
220218
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,
301299
local_bw_overhead = intel_dp_mst_bw_overhead(crtc_state,
302300
false, dsc_slice_count, link_bpp_x16);
303301

304-
intel_dp_mst_compute_min_hblank(crtc_state, connector, link_bpp_x16);
302+
intel_dp_mst_compute_min_hblank(crtc_state, link_bpp_x16);
305303

306304
intel_dp_mst_compute_m_n(crtc_state,
307305
local_bw_overhead,

0 commit comments

Comments
 (0)