From 13371b961cc3bb5cf94b343cb20243f0dc9e56a8 Mon Sep 17 00:00:00 2001 From: "Jerry (Fangzhi) Zuo" Date: Thu, 4 Jan 2018 17:02:47 -0500 Subject: [PATCH 1096/4131] drm/amd/display: Fixed MST display doesn't light up Need to take care of DRM interface prior to 4.12 kernel. Signed-off-by: Jerry (Fangzhi) Zuo Reviewed-by: Harry Wentland Acked-by: Junwei Zhang Acked-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index 9bd142f..02f7f04 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -233,8 +233,12 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( pbn = drm_dp_calc_pbn_mode(clock, bpp); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) slots = drm_dp_find_vcpi_slots(mst_mgr, pbn); ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, slots); +#else + ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, &slots); +#endif if (!ret) return false; -- 2.7.4