Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7a26998 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 7089db84 bb08c04d

drivers/gpu/drm/drm_dp_mst_topology.c

+1 −1
Original line number Diff line number Diff line
@@ -1817,7 +1817,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) 
				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, port->vcpi.vcpi, &mgr->payloads[i]);

				drm_dp_destroy_payload_step1(mgr, port, mgr->payloads[i].vcpi, &mgr->payloads[i]);

				req_payload.payload_state = mgr->payloads[i].payload_state;

				mgr->payloads[i].start_slot = 0;

			}