HDCP MST scenario sees modeset locking issue ever since topology_state was added to drm_atomic_state and all modeset locks were being taken for us causing a locking issue to occur when we iterate over connectors to assign vcpi id, the fix being to pass acquire_ctx to drm_modeset_lock Signed-off-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx> Suraj Kandpal (2): drm/i915/hdcp: add intel_atomic_state argument to hdcp_enable function drm/i915/hdcp: Fix modeset locking issue in hdcp mst drivers/gpu/drm/i915/display/intel_ddi.c | 5 ++- .../drm/i915/display/intel_display_types.h | 2 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 38 ++++++++++--------- drivers/gpu/drm/i915/display/intel_hdcp.h | 6 ++- 5 files changed, 32 insertions(+), 23 deletions(-) -- 2.25.1