> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Suraj > Kandpal > Sent: Monday, May 15, 2023 4:02 PM > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Subject: [PATCH v4 0/4] Fix modeset locking issue in HDCP MST > > 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. > > --v2 > -call intel_hdcp_prepare_stream instead of intel_hdcp_required_stream in > the beginning [Ankit] -replace intel_connector argument with intel_encoder > [Jani] > > --v3 > -break intel_hdcp_required_stream to two parts and call > intel_hdcp_set_content_streams at beginning [Ankit] -Move encoder_type0 > out of loop [Ankit] > > --v4 > -rename intel_set_content_stream [Ankit] -remove return type from > intel_hdcp_prepare_stream and intel_hdcp_required_content_stream > [Ankit] > > Signed-off-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx> > > Suraj Kandpal (4): > drm/i915/hdcp: add intel_atomic_state argument to hdcp_enable function > drm/i915/hdcp: Remove enforce_type0 check outside loop > drm/i915/hdcp: Fix modeset locking issue in hdcp mst > drm/i915/hdcp: Fill hdcp2_streamid_type and k in appropriate places Pushed the changes to din. Thanks for patches. Regards, Animesh > > drivers/gpu/drm/i915/display/intel_ddi.c | 4 +- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 +- > drivers/gpu/drm/i915/display/intel_hdcp.c | 143 ++++++++++---------- > drivers/gpu/drm/i915/display/intel_hdcp.h | 6 +- > 4 files changed, 81 insertions(+), 76 deletions(-) > > -- > 2.25.1