diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-03-28 10:30:57 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-03-28 10:30:57 -0400 |
| commit | cecdd52a3dd312564f81a39df08378b7b39a2654 (patch) | |
| tree | 149c75714b5a8c9688b32a264b75b8c033106da4 /drivers/gpu/drm/i915/display/intel_display.c | |
| parent | 42b4c479025d92b2a4869bd233f20159ae9ce692 (diff) | |
| parent | 46f28427f6f824b6cff06fa025a55350b7de454a (diff) | |
Merge drm/drm-next into drm-intel-next
Catch up with 6.3-rc cycle...
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 37d03380b844..b53a1d969344 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5893,6 +5893,10 @@ int intel_modeset_all_pipes(struct intel_atomic_state *state, if (ret) return ret; + ret = intel_dp_mst_add_topology_state_for_crtc(state, crtc); + if (ret) + return ret; + ret = intel_atomic_add_affected_planes(state, crtc); if (ret) return ret; |