Merge tag 'topic/core-stuff-2014-11-05' of git://anongit.freedesktop.org/drm-intel...

[platform/kernel/linux-rpi.git] / include / drm / drm_dp_mst_helper.h

diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index 3ecfcc1..05e85ee 100644 (file)
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -388,6 +388,7 @@ struct drm_dp_payload {
        int payload_state;
        int start_slot;
        int num_slots;
+       int vcpi;
 };
 
 /**
@@ -454,6 +455,7 @@ struct drm_dp_mst_topology_mgr {
        struct drm_dp_vcpi **proposed_vcpis;
        struct drm_dp_payload *payloads;
        unsigned long payload_mask;
+       unsigned long vcpi_mask;
 
        wait_queue_head_t tx_waitq;
        struct work_struct work;