3.18-stable patches

added patches:
	drm-dp-mst-save-vcpi-with-payloads.patch

diff --git a/queue-3.18/drm-dp-mst-save-vcpi-with-payloads.patch b/queue-3.18/drm-dp-mst-save-vcpi-with-payloads.patch
new file mode 100644 (file)
index 0000000..647e9d7
--- /dev/null
+++ b/queue-3.18/drm-dp-mst-save-vcpi-with-payloads.patch
@@ -0,0 +1,41 @@
+From 6cecdf7a161d2b909dc7c8979176bbc4f0669968 Mon Sep 17 00:00:00 2001
+From: Harry Wentland <harry.wentland@amd.com>
+Date: Mon, 7 Dec 2015 13:55:52 -0500
+Subject: drm/dp/mst: save vcpi with payloads
+
+From: Harry Wentland <harry.wentland@amd.com>
+
+commit 6cecdf7a161d2b909dc7c8979176bbc4f0669968 upstream.
+
+This makes it possibly for drivers to find the associated
+mst_port by looking at the payload allocation table.
+
+Signed-off-by: Harry Wentland <harry.wentland@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Link: http://patchwork.freedesktop.org/patch/msgid/1449514552-10236-3-git-send-email-harry.wentland@amd.com
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Cc: Kai Heng Feng <kai.heng.feng@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/drm_dp_mst_topology.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/gpu/drm/drm_dp_mst_topology.c
++++ b/drivers/gpu/drm/drm_dp_mst_topology.c
+@@ -1707,6 +1707,7 @@ int drm_dp_update_payload_part1(struct d
+                               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;
+@@ -1722,6 +1723,7 @@ int drm_dp_update_payload_part1(struct d
+                       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, port->vcpi.vcpi, &mgr->payloads[i]);

diff --git a/queue-3.18/series b/queue-3.18/series
index d39de0dc438ff60233f49c122f1ffda0c93b8a24..785376ee02ce3c2bdde291a2000350d8ea797532 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -1 +1,2 @@
 x86-mm-disable-preemption-during-cr3-read-write.patch
+drm-dp-mst-save-vcpi-with-payloads.patch