tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/i915/dp: Restore the missing check for intel_dp_has_joiner

Commit ad121a62d566 ("drm/i915/dp: Rework pipe joiner logic in mode_valid")
replaced intel_dp_num_joined_pipes() with an explicit joiner candidate
iteration. The previous code implicitly checked for DP joiner capability
via intel_dp_has_joiner(), but this check was lost during the refactor.

Restore the missing intel_dp_has_joiner() check in intel_dp_can_join() so
that DP specific joiner conditions are taken into account.

v2: Derive intel_dp from intel_attached_dp(). (Imre)

Fixes: ad121a62d566 ("drm/i915/dp: Rework pipe joiner logic in mode_valid")
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Link: https://patch.msgid.link/20260206044753.808631-1-ankit.k.nautiyal@intel.com

Ankit Nautiyal 20df1466 5293d4ab

+8 -2
+8 -2
drivers/gpu/drm/i915/display/intel_dp.c
··· 1397 1397 } 1398 1398 1399 1399 static 1400 - bool intel_dp_can_join(struct intel_display *display, 1400 + bool intel_dp_can_join(struct intel_dp *intel_dp, 1401 1401 int num_joined_pipes) 1402 1402 { 1403 + struct intel_display *display = to_intel_display(intel_dp); 1404 + 1405 + if (num_joined_pipes > 1 && !intel_dp_has_joiner(intel_dp)) 1406 + return false; 1407 + 1403 1408 switch (num_joined_pipes) { 1404 1409 case 1: 1405 1410 return true; ··· 7225 7220 int num_joined_pipes) 7226 7221 { 7227 7222 struct intel_display *display = to_intel_display(connector); 7223 + struct intel_dp *intel_dp = intel_attached_dp(connector); 7228 7224 7229 - if (!intel_dp_can_join(display, num_joined_pipes)) 7225 + if (!intel_dp_can_join(intel_dp, num_joined_pipes)) 7230 7226 return false; 7231 7227 7232 7228 if (hdisplay > num_joined_pipes * intel_dp_max_hdisplay_per_pipe(display))