From nobody Fri Oct 3 01:10:45 2025 Received: from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C38E2765C1 for ; Tue, 9 Sep 2025 09:09:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.47.19.246 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757408998; cv=none; b=H0C/x5ZZoAlACF8YQMzNP7WX2sfk+jDiHEZN4BV6iKULx/VH1Ohab+E/XIsDLtjIVVnsAmSrsWh2lMbBTDRU7N0mxR1S3QSWYzM/huDyhsJQvD4WqKJE5gkcNjOuDLb9+zM/Pv9/O9TrEPVNkzHPYumMFMuuveG4956IH72+20U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757408998; c=relaxed/simple; bh=D34kq3r7k+H6q6dNbv0C7/Aqz9VAOIRBun7toR5ws5U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=etpd6TEkE/an3LM0ox0ZB1eoaJGcQW/WdmCsBUaoQpMTjkPX7ojYeMN+gafX4veREI4+1wWmHs87RICjJq+aGSQ8PVMfyRqGUdMFTtF8uH/k6cvYMoc6TOgnNqE0UHkzkvpqVdNXQ0GZaaSXKFrvB+0Ix054cURsWvmUFrUwDdg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=qUQwkFQS; arc=none smtp.client-ip=198.47.19.246 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="qUQwkFQS" Received: from fllvem-sh04.itg.ti.com ([10.64.41.54]) by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTP id 58999LTC255473; Tue, 9 Sep 2025 04:09:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1757408961; bh=7PfiPykHsTbwLkTcmOnffcGjkDy3xo0UuxzokO5rkK8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=qUQwkFQSiB0KBTjNs6hjtkqRwRmiAD3mJvTqIg9aqF4xooBrOe6mc8bIr3TsMT2x5 o9EC8h2b8TgSav6Oy+8X7ktzo5UfxA5oPRvFZdsBf6up7Z6sYvYWEUkpFyU/El6KSa pddDL8IMn4MiRld32bkewqMuyGMcV3tjbLQ4wpnk= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by fllvem-sh04.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 58999Kfe247942 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Tue, 9 Sep 2025 04:09:21 -0500 Received: from DFLE103.ent.ti.com (10.64.6.24) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Tue, 9 Sep 2025 04:09:20 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55 via Frontend Transport; Tue, 9 Sep 2025 04:09:20 -0500 Received: from hkshenoy.dhcp.ti.com (hkshenoy.dhcp.ti.com [172.24.235.208]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 58998Pkw2399851; Tue, 9 Sep 2025 04:09:13 -0500 From: Harikrishna Shenoy To: , , , , , , , , , , , , , , , , , , , , , , , , CC: , Subject: [PATCH v6 6/6] drm/bridge: cadence: cdns-mhdp8546-core: Handle HDCP state in bridge atomic check Date: Tue, 9 Sep 2025 14:38:24 +0530 Message-ID: <20250909090824.1655537-7-h-shenoy@ti.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250909090824.1655537-1-h-shenoy@ti.com> References: <20250909090824.1655537-1-h-shenoy@ti.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea Content-Type: text/plain; charset="utf-8" Now that we have DBANC framework and legacy connector functions removed, handle the HDCP disabling in bridge atomic check rather than in connector atomic check previously. Signed-off-by: Harikrishna Shenoy --- .../drm/bridge/cadence/cdns-mhdp8546-core.c | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/= gpu/drm/bridge/cadence/cdns-mhdp8546-core.c index 4fb1db3e030c..af41b2908a74 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c @@ -1960,6 +1960,10 @@ static int cdns_mhdp_atomic_check(struct drm_bridge = *bridge, { struct cdns_mhdp_device *mhdp =3D bridge_to_mhdp(bridge); const struct drm_display_mode *mode =3D &crtc_state->adjusted_mode; + struct drm_connector_state *old_state, *new_state; + struct drm_atomic_state *state =3D crtc_state->state; + struct drm_connector *conn =3D mhdp->connector; + u64 old_cp, new_cp; =20 mutex_lock(&mhdp->link_mutex); =20 @@ -1979,6 +1983,25 @@ static int cdns_mhdp_atomic_check(struct drm_bridge = *bridge, if (mhdp->info) bridge_state->input_bus_cfg.flags =3D *mhdp->info->input_bus_flags; =20 + if (conn && mhdp->hdcp_supported) { + old_state =3D drm_atomic_get_old_connector_state(state, conn); + new_state =3D drm_atomic_get_new_connector_state(state, conn); + old_cp =3D old_state->content_protection; + new_cp =3D new_state->content_protection; + + if (old_state->hdcp_content_type !=3D new_state->hdcp_content_type && + new_cp !=3D DRM_MODE_CONTENT_PROTECTION_UNDESIRED) { + new_state->content_protection =3D DRM_MODE_CONTENT_PROTECTION_DESIRED; + crtc_state =3D drm_atomic_get_new_crtc_state(state, new_state->crtc); + crtc_state->mode_changed =3D true; + } + + if (!new_state->crtc) { + if (old_cp =3D=3D DRM_MODE_CONTENT_PROTECTION_ENABLED) + new_state->content_protection =3D DRM_MODE_CONTENT_PROTECTION_DESIRED; + } + } + mutex_unlock(&mhdp->link_mutex); return 0; } --=20 2.34.1