From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6EB7FCD1297 for ; Thu, 30 Apr 2026 03:32:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D62410F1FA; Thu, 30 Apr 2026 03:32:31 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="gz9dCjp9"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id C70FC10F1F8; Thu, 30 Apr 2026 03:32:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1777519949; x=1809055949; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2bknRvP/utNIXPi+EO9ezxzbuxkhgRCbYXVFoLgIKTg=; b=gz9dCjp9ySM3nqZ5diKJwanYsR58/7E3zzCHVB7mFTSNIUCiNQ4ctpJ7 udRJAwbil/TQz/uwAUxy9e+gbLkobGUehnBtvSV3imGRYA6U3C/mAcqmD 5PxzviTMG4t/NOaQvw2PvmxKVPqf+MNRpa8SgFznoPGW0UlU11OQWO5Gw ngofR92shaGxHZxJdP4ze7glROhSU33P37BFlFKU60VDHjEN+gKWElY3k 4jykY/NonYK+HpYD5w+UNhZoywPKg5Np6oc965gssw+D/F0l3RcDT/RLx d3z+5mg1OvEZAFC+/BXwwMx5NyaeI8KcEwk0jU6Q5EaiXuNy4xo50UqsH Q==; X-CSE-ConnectionGUID: bsjXjrJSRAmygb+9ddXyIw== X-CSE-MsgGUID: qIaaKsFASgKk3n/49GwqBA== X-IronPort-AV: E=McAfee;i="6800,10657,11771"; a="95882096" X-IronPort-AV: E=Sophos;i="6.23,207,1770624000"; d="scan'208";a="95882096" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2026 20:32:29 -0700 X-CSE-ConnectionGUID: G0z/ZYLoRqCxP2gmRyZwPw== X-CSE-MsgGUID: Z1UjA5MbTbCeGRQd1LAz4A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,207,1770624000"; d="scan'208";a="227954550" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by fmviesa009.fm.intel.com with ESMTP; 29 Apr 2026 20:32:26 -0700 From: Suraj Kandpal 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 Subject: [PATCH 1/2] drm/915/hdcp: Use new MST topology state in intel_conn_to_vcpi() Date: Thu, 30 Apr 2026 09:02:21 +0530 Message-Id: <20260430033222.3411174-2-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430033222.3411174-1-suraj.kandpal@intel.com> References: <20260430033222.3411174-1-suraj.kandpal@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" intel_conn_to_vcpi() runs from the HDCP enable path in commit_tail and looks up the VCPI via mgr->base.state. When an ALLOCATE_PAYLOAD is being driven on the mgr just before HDCP enable, that payload list is being mutated in place, so the lookup can miss the port and trip drm_WARN_ON(!payload), causing HDCP to be programmed with VCPI 0. Use drm_atomic_get_new_mst_topology_state() to read the topology state attached to this atomic commit (stable, decided in atomic_check), and bail out cleanly when no topology state or payload is present for this port instead of WARNing. Signed-off-by: Suraj Kandpal --- drivers/gpu/drm/i915/display/intel_hdcp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 9b4ff3b80b05..91d2d7d823cc 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -72,6 +72,7 @@ intel_hdcp_adjust_hdcp_line_rekeying(struct intel_encoder *encoder, static int intel_conn_to_vcpi(struct intel_atomic_state *state, struct intel_connector *connector) { + struct intel_display *display = to_intel_display(state); struct drm_dp_mst_topology_mgr *mgr; struct drm_dp_mst_atomic_payload *payload; struct drm_dp_mst_topology_state *mst_state; @@ -82,9 +83,14 @@ static int intel_conn_to_vcpi(struct intel_atomic_state *state, mgr = connector->mst.port->mgr; drm_modeset_lock(&mgr->base.lock, state->base.acquire_ctx); - mst_state = to_drm_dp_mst_topology_state(mgr->base.state); + mst_state = drm_atomic_get_new_mst_topology_state(&state->base, mgr); + if (!mst_state) { + drm_dbg_kms(display->drm, "MST topology still not created\n"); + return 0; + } + payload = drm_atomic_get_mst_payload_state(mst_state, connector->mst.port); - if (drm_WARN_ON(mgr->dev, !payload)) + if (!payload) return 0; return payload->vcpi; -- 2.34.1