diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2021-02-12 12:54:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-02-12 12:54:58 +0100 |
| commit | 62137364e3e8afcc745846c5c67cacf943149073 (patch) | |
| tree | 42f2bdee6b16e383b6e0a94cb3abc62f335d721a /drivers/gpu/drm/i915/display/intel_dp_mst.c | |
| parent | checkpatch: Don't check for mutex_trylock_recursive() (diff) | |
| parent | Merge tag 'powerpc-5.11-8' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux (diff) | |
| download | wireguard-linux-62137364e3e8afcc745846c5c67cacf943149073.tar.xz wireguard-linux-62137364e3e8afcc745846c5c67cacf943149073.zip | |
Merge branch 'linus' into locking/core, to pick up upstream fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 27f04aed8764..3286b232be0b 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -69,7 +69,9 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr, connector->port, - crtc_state->pbn, 0); + crtc_state->pbn, + drm_dp_get_vc_payload_bw(crtc_state->port_clock, + crtc_state->lane_count)); if (slots == -EDEADLK) return slots; if (slots >= 0) |