From: Jani Nikula <jani.nikula@intel.com>
Date: Mon, 12 Sep 2022 08:11:02 +0000 (+0300)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Tag: v6.6.17~3937^2~17^2~1039
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f3562b3bca078b40aa198db8fdc68439b7b0399;p=platform%2Fkernel%2Flinux-rpi.git

Merge drm/drm-next into drm-intel-next

Backmerge to sync the DP MST atomic changes to drm-intel-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

6f3562b3bca078b40aa198db8fdc68439b7b0399
diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.c
index eafcc24f4f73,7713c19042f3..5adfd226d6c4
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@@ -57,8 -58,13 +58,12 @@@ static int intel_dp_mst_compute_link_co
  	struct drm_i915_private *i915 = to_i915(connector->base.dev);
  	const struct drm_display_mode *adjusted_mode =
  		&crtc_state->hw.adjusted_mode;
 -	bool constant_n = drm_dp_has_quirk(&intel_dp->desc, DP_DPCD_QUIRK_CONSTANT_N);
  	int bpp, slots = -EINVAL;
  
+ 	mst_state = drm_atomic_get_mst_topology_state(state, &intel_dp->mst_mgr);
+ 	if (IS_ERR(mst_state))
+ 		return PTR_ERR(mst_state);
+ 
  	crtc_state->lane_count = limits->max_lane_count;
  	crtc_state->port_clock = limits->max_rate;