Skip to contentSkip to conversation

Patch "drm/dp/mst: Always clear proposed vcpi table for port." has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Jul 24, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/dp/mst: Always clear proposed vcpi table for port.

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-dp-mst-always-clear-proposed-vcpi-table-for-port.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From fd2d2bac6e79b0be91ab86a6075a0c46ffda658a Mon Sep 17 00:00:00 2001

From: Andrey Grodzovsky <[email protected]>
Date: Wed, 25 May 2016 16:45:43 -0400
Subject: drm/dp/mst: Always clear proposed vcpi table for port.

From: Andrey Grodzovsky <[email protected]>

commit fd2d2bac6e79b0be91ab86a6075a0c46ffda658a upstream.

Not clearing mst manager's proposed vcpis table for destroyed connectors when the manager is stopped leaves it pointing to unrefernced memory, this causes pagefault when the manager is restarted when plugging back a branch.

Fixes 91a25e463130 ("drm/dp/mst: deallocate payload on port destruction")
Cc Mykola Lysenko <[email protected]>
Cc Alex Deucher <[email protected]>
---
 drivers/gpu/drm/drm_dp_mst_topology.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +3 -5
@@ -2874,11 +2874,9 @@ static void drm_dp_destroy_connector_wor
 		drm_dp_port_teardown_pdt(port, port->pdt);
 
 		if (!port->input && port->vcpi.vcpi > 0) {
-			if (mgr->mst_state) {
-				drm_dp_mst_reset_vcpi_slots(mgr, port);
-				drm_dp_update_payload_part1(mgr);
-				drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
-			}
+			drm_dp_mst_reset_vcpi_slots(mgr, port);
+			drm_dp_update_payload_part1(mgr);
+			drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
 		}
 
 		kref_put(&port->kref, drm_dp_free_mst_port);

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/drm-dp-mst-always-clear-proposed-vcpi-table-for-port.patch