summaryrefslogtreecommitdiff
path: root/include/drm
diff options
context:
space:
mode:
authorRodrigo Vivi <rodrigo.vivi@intel.com>2024-12-09 17:56:45 +0300
committerRodrigo Vivi <rodrigo.vivi@intel.com>2024-12-09 17:59:47 +0300
commitbc893280751ab566892399fe4e81a9a67a4097be (patch)
treeb67f2114392d7888adb463a30fe2e368ccb90697 /include/drm
parent26bba754539a274fb4905cb07d244ca291bcc5d0 (diff)
parentfac04efc5c793dccbd07e2d59af9f90b7fc0dca4 (diff)
downloadlinux-bc893280751ab566892399fe4e81a9a67a4097be.tar.xz
Merge drm/drm-next into drm-xe-next
Catch up with -rc2 and fixing namespace conflict issue caused by commit cdd30ebb1b9f ("module: Convert symbol namespace to string literal") and commit 0c45e76fcc62 ("drm/xe/vsec: Support BMG devices") Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/display/drm_dp_mst_helper.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h
index f6a1cbb0f600..a80ba457a858 100644
--- a/include/drm/display/drm_dp_mst_helper.h
+++ b/include/drm/display/drm_dp_mst_helper.h
@@ -700,6 +700,13 @@ struct drm_dp_mst_topology_mgr {
bool payload_id_table_cleared : 1;
/**
+ * @reset_rx_state: The down request's reply and up request message
+ * receiver state must be reset, after the topology manager got
+ * removed. Protected by @lock.
+ */
+ bool reset_rx_state : 1;
+
+ /**
* @payload_count: The number of currently active payloads in hardware. This value is only
* intended to be used internally by MST helpers for payload tracking, and is only safe to
* read/write from the atomic commit (not check) context.