diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2025-03-08 20:09:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-08 20:09:27 +0100 |
| commit | 14296d0e85d45695ad2dc65b653b29e5a3514cdb (patch) | |
| tree | c5d875755a94e8fa9d671d0cdd6f1e4755318698 /drivers/gpu/drm/i915/display/intel_dp_mst.c | |
| parent | x86/mm: Define PTRS_PER_PMD for assembly code too (diff) | |
| parent | Merge tag 'slab-for-6.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab (diff) | |
| download | wireguard-linux-14296d0e85d45695ad2dc65b653b29e5a3514cdb.tar.xz wireguard-linux-14296d0e85d45695ad2dc65b653b29e5a3514cdb.zip | |
Merge branch 'linus' into x86/urgent, to pick up dependent patches
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 | 3 |
1 files changed, 2 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 a65cf97ad12d..86d6185fda50 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -1867,7 +1867,8 @@ intel_dp_mst_encoder_init(struct intel_digital_port *dig_port, int conn_base_id) /* create encoders */ mst_stream_encoders_create(dig_port); ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, display->drm, - &intel_dp->aux, 16, 3, conn_base_id); + &intel_dp->aux, 16, + INTEL_NUM_PIPES(display), conn_base_id); if (ret) { intel_dp->mst_mgr.cbs = NULL; return ret; |