diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2020-02-08 04:47:43 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2020-02-08 04:47:43 +0300 |
| commit | c0f00d270eba3cba688dd62a7b1a742ad289b879 (patch) | |
| tree | cea3939f9834a67d1fce2d9e74d5125f56167639 /drivers/gpu/drm/i915/display/intel_dp_mst.c | |
| parent | 5ba32c7be81e53ea8a27190b0f6be98e6c6779af (diff) | |
| parent | 9f880327160feb695de03caa29604883b0d00087 (diff) | |
| download | linux-c0f00d270eba3cba688dd62a7b1a742ad289b879.tar.xz | |
Merge drm/drm-next into drm-intel-next-queued
Moving the base forward since this one was so old.
New base contains fixes that we needed.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index ffa2aa2222bf..b8aee506d595 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -61,10 +61,11 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, crtc_state->pipe_bpp = bpp; crtc_state->pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, - crtc_state->pipe_bpp); + crtc_state->pipe_bpp, + false); slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr, - port, crtc_state->pbn); + port, crtc_state->pbn, 0); if (slots == -EDEADLK) return slots; if (slots >= 0) |