diff options
author | Dave Airlie <airlied@redhat.com> | 2017-02-15 22:26:41 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-02-15 22:26:41 -0500 |
commit | b7a26998590c5efb371562fb8a84bc93094009f5 (patch) | |
tree | 8e7092787bd3d13723b024c7df15cc0627048751 | |
parent | 7089db84e356562f8ba737c29e472cc42d530dbc (diff) | |
parent | bb08c04dc867b5f392caec635c097d5d5fcd8c9f (diff) |
Merge tag 'drm-misc-fixes-2017-02-15' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
dp/mst oops fix for v4.10
* tag 'drm-misc-fixes-2017-02-15' of git://anongit.freedesktop.org/git/drm-misc:
drm/dp/mst: fix kernel oops when turning off secondary monitor
-rw-r--r-- | drivers/gpu/drm/drm_dp_mst_topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index aa644487749c..f59771da52ee 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c | |||
@@ -1817,7 +1817,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) | |||
1817 | mgr->payloads[i].vcpi = req_payload.vcpi; | 1817 | mgr->payloads[i].vcpi = req_payload.vcpi; |
1818 | } else if (mgr->payloads[i].num_slots) { | 1818 | } else if (mgr->payloads[i].num_slots) { |
1819 | mgr->payloads[i].num_slots = 0; | 1819 | mgr->payloads[i].num_slots = 0; |
1820 | drm_dp_destroy_payload_step1(mgr, port, port->vcpi.vcpi, &mgr->payloads[i]); | 1820 | drm_dp_destroy_payload_step1(mgr, port, mgr->payloads[i].vcpi, &mgr->payloads[i]); |
1821 | req_payload.payload_state = mgr->payloads[i].payload_state; | 1821 | req_payload.payload_state = mgr->payloads[i].payload_state; |
1822 | mgr->payloads[i].start_slot = 0; | 1822 | mgr->payloads[i].start_slot = 0; |
1823 | } | 1823 | } |