diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-03-13 09:45:30 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-03-13 09:45:30 +0000 |
| commit | 1e2506d20942a4211e4eab8c034c53414014c9b9 (patch) | |
| tree | 65d981556f9585de6d1ae24f90880e6e312d820c /sys | |
| parent | 811188458c5a85a327eb0ac0aabb0a35a644a19c (diff) | |
drm/dp/mst: save vcpi with payloads
From Harry Wentland
c088f7bc3310bb57e0aaea297c7e2f467015d215 in linux 4.4.y/4.4.94
6cecdf7a161d2b909dc7c8979176bbc4f0669968 in mainline linux
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/drm_dp_mst_topology.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/drm_dp_mst_topology.c b/sys/dev/pci/drm/drm_dp_mst_topology.c index 8d567852f4f..00177ef2c7b 100644 --- a/sys/dev/pci/drm/drm_dp_mst_topology.c +++ b/sys/dev/pci/drm/drm_dp_mst_topology.c @@ -1806,6 +1806,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) return -EINVAL; } req_payload.num_slots = mgr->proposed_vcpis[i]->num_slots; + req_payload.vcpi = mgr->proposed_vcpis[i]->vcpi; } else { port = NULL; req_payload.num_slots = 0; @@ -1821,6 +1822,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) if (req_payload.num_slots) { drm_dp_create_payload_step1(mgr, mgr->proposed_vcpis[i]->vcpi, &req_payload); mgr->payloads[i].num_slots = req_payload.num_slots; + mgr->payloads[i].vcpi = req_payload.vcpi; } else if (mgr->payloads[i].num_slots) { mgr->payloads[i].num_slots = 0; drm_dp_destroy_payload_step1(mgr, port, mgr->payloads[i].vcpi, &mgr->payloads[i]); |