From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E606261FFB; Mon, 27 May 2024 15:57:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716825445; cv=none; b=Naog4BMWKhEN7Bxg0TvxY5JUy8DmzmoixPBCb5s7CLCPE42HI4DEtN/X8lZi3AAwLbNtXMrDfAzhNs0MrBcD1xHmSn83TW8YlewCw1dwauvXymcuBe7ankEBt2rFxqL0aak8f2/LpFA+Pzz2kBSFyTr9XGZ4cBxQuEC0TdrtzaY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716825445; c=relaxed/simple; bh=Bx1v8vw994CWMzcge9Pp+GPABdpFSNEB2dedqwadJYI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JvwKE78SNogFHy/AXVwgYb0tyDsligjcROE8fKBmDBkznJsGpCVsRZftjVp2AoUBC5ck/lLUHgiR4D2HtaRNVhAVGr678hAdFoKmPrccSz+pJOGtHwQS5I4UvBKrAXtUHf6n2Z066QK2P6ffCfJW0W8LFLA35iAbU6XKM8QNm0Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EF4fXxGR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EF4fXxGR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E935C2BBFC; Mon, 27 May 2024 15:57:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716825444; bh=Bx1v8vw994CWMzcge9Pp+GPABdpFSNEB2dedqwadJYI=; h=From:To:Cc:Subject:Date:From; b=EF4fXxGRi6pvsxyEvqna0BLa0EUN51gyXvlDsEwcq4dfbJBDp/f3sReVRUtdzwHU0 D0lZLOvFLCEec2y/14TT2vYSBnnPsadONl1a9r2zLprM5SmKPNsAcplXBdnytRtBnm Oa+q6FzlcV2exllZDWJM8QcfhWcJtbS/Xuti7jEbFxamDHWpSVFRr5EVRawUk/jha5 PkF+0F06GdjUQiejvcnWgQJZle7o/0GzuYp5rT2PB60aXMrf7FNrLjDS+bmjlkVRgh 5CfeIls/+8VA7B5YjHuYL5Ve/an519a4/UrSGY39nzbX41bT9QnUcWvP73LZjygPs3 LUDHkS7/oxfRA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nicholas Kazlauskas , Mario Limonciello , Alex Deucher , Charlene Liu , Alex Hung , Daniel Wheeler , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, martin.leung@amd.com, wayne.lin@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.1 01/11] drm/amd/display: Exit idle optimizations before HDCP execution Date: Mon, 27 May 2024 11:56:38 -0400 Message-ID: <20240527155710.3865826-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.92 Content-Transfer-Encoding: 8bit From: Nicholas Kazlauskas [ Upstream commit f30a3bea92bdab398531129d187629fb1d28f598 ] [WHY] PSP can access DCN registers during command submission and we need to ensure that DCN is not in PG before doing so. [HOW] Add a callback to DM to lock and notify DC for idle optimization exit. It can't be DC directly because of a potential race condition with the link protection thread and the rest of DM operation. Cc: Mario Limonciello Cc: Alex Deucher Reviewed-by: Charlene Liu Acked-by: Alex Hung Signed-off-by: Nicholas Kazlauskas Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 10 ++++++++++ drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c index 5e01c6e24cbc8..9a5a1726acaf8 100644 --- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c +++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c @@ -88,6 +88,14 @@ static uint8_t is_cp_desired_hdcp2(struct mod_hdcp *hdcp) !hdcp->connection.is_hdcp2_revoked; } +static void exit_idle_optimizations(struct mod_hdcp *hdcp) +{ + struct mod_hdcp_dm *dm = &hdcp->config.dm; + + if (dm->funcs.exit_idle_optimizations) + dm->funcs.exit_idle_optimizations(dm->handle); +} + static enum mod_hdcp_status execution(struct mod_hdcp *hdcp, struct mod_hdcp_event_context *event_ctx, union mod_hdcp_transition_input *input) @@ -543,6 +551,8 @@ enum mod_hdcp_status mod_hdcp_process_event(struct mod_hdcp *hdcp, memset(&event_ctx, 0, sizeof(struct mod_hdcp_event_context)); event_ctx.event = event; + exit_idle_optimizations(hdcp); + /* execute and transition */ exec_status = execution(hdcp, &event_ctx, &hdcp->auth.trans_input); trans_status = transition( diff --git a/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h b/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h index 3348bb97ef81a..dfa8168e51890 100644 --- a/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h +++ b/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h @@ -155,6 +155,13 @@ struct mod_hdcp_ddc { } funcs; }; +struct mod_hdcp_dm { + void *handle; + struct { + void (*exit_idle_optimizations)(void *handle); + } funcs; +}; + struct mod_hdcp_psp { void *handle; void *funcs; @@ -271,6 +278,7 @@ struct mod_hdcp_display_query { struct mod_hdcp_config { struct mod_hdcp_psp psp; struct mod_hdcp_ddc ddc; + struct mod_hdcp_dm dm; uint8_t index; }; -- 2.43.0