summaryrefslogtreecommitdiffstats
path: root/include/drm/drm_dp_mst_helper.h
diff options
context:
space:
mode:
authorDave Airlie2019-02-18 04:27:15 +0100
committerDave Airlie2019-02-18 04:27:15 +0100
commitc06de56121e3ac0f0f1f4a081c041654ffcacd62 (patch)
tree3662e7052352b0f1b78e8832b1d3b91ca211b798 /include/drm/drm_dp_mst_helper.h
parentMerge tag 'drm-misc-next-2019-02-11' of git://anongit.freedesktop.org/drm/drm... (diff)
parentLinux 5.0-rc7 (diff)
downloadkernel-qcow2-linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.tar.gz
kernel-qcow2-linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.tar.xz
kernel-qcow2-linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.zip
Merge v5.0-rc7 into drm-next
Backmerging for nouveau and imx that needed some fixes for next pulls. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/drm_dp_mst_helper.h')
-rw-r--r--include/drm/drm_dp_mst_helper.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index 451d020f0137..8c97a5f92c47 100644
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -641,7 +641,8 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
struct drm_dp_mst_topology_mgr *mgr);
void drm_dp_mst_topology_mgr_suspend(struct drm_dp_mst_topology_mgr *mgr);
-int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr);
+int __must_check
+drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr);
struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
struct drm_dp_mst_topology_mgr *mgr);
int __must_check