From: Suraj Kandpal <suraj.kandpal@intel.com>
To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Cc: ankit.k.nautiyal@intel.com, fnu.vishwanatha@intel.com,
santhosh.reddy.guddati@intel.com,
Suraj Kandpal <suraj.kandpal@intel.com>
Subject: Fix MST VCPI lookup and modeset-lock splat
Date: Thu, 30 Apr 2026 08:59:00 +0530 [thread overview]
Message-ID: <20260430032902.3409731-1-suraj.kandpal@intel.com> (raw)
intel_conn_to_vcpi() is called from the HDCP enable path in commit_tail
to look
up the VCPI of the MST stream that HDCP is being enabled on. Today it
reads the
topology state directly from mgr->base.state and takes mgr->base.lock
with the
in-flight state->base.acquire_ctx.
This breaks in two ways on MST + HDCP, especially when an
ALLOCATE_PAYLOAD
transaction is being driven on the mgr just before HDCP enable runs:
- mgr->base.state's payload list is being mutated in place by the MST
payload code, so drm_atomic_get_mst_payload_state() can fail to find
the entry for this connector's port. That trips drm_WARN_ON(!payload)
and HDCP ends up programmed with VCPI 0.
- By the time we reach commit_tail/encoder enable,
state->base.acquire_ctx
is no longer valid for acquiring new modeset locks. Taking
mgr->base.lock here produces a modeset-lock splat.
This series fixes both.
Suraj Kandpal (2):
drm/915/hdcp: Use new MST topology state in intel_conn_to_vcpi()
drm/i915/hdcp: Drop mgr->base.lock acquisition in intel_conn_to_vcpi()
drivers/gpu/drm/i915/display/intel_hdcp.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
--
2.34.1
next reply other threads:[~2026-04-30 3:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-30 3:29 Suraj Kandpal [this message]
2026-04-30 3:29 ` [PATCH 1/2] drm/915/hdcp: Use new MST topology state in intel_conn_to_vcpi() Suraj Kandpal
2026-05-04 6:20 ` Reddy Guddati, Santhosh
2026-04-30 3:29 ` [PATCH 2/2] drm/i915/hdcp: Drop mgr->base.lock acquisition " Suraj Kandpal
2026-05-04 9:53 ` Reddy Guddati, Santhosh
2026-04-30 3:36 ` ✓ CI.KUnit: success for series starting with [1/2] drm/915/hdcp: Use new MST topology state " Patchwork
2026-04-30 4:25 ` ✓ Xe.CI.BAT: " Patchwork
2026-04-30 14:44 ` ✗ Xe.CI.FULL: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260430032902.3409731-1-suraj.kandpal@intel.com \
--to=suraj.kandpal@intel.com \
--cc=ankit.k.nautiyal@intel.com \
--cc=fnu.vishwanatha@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=santhosh.reddy.guddati@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox