From patchwork Mon Aug 24 08:28:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 264936 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B3F3C433DF for ; Mon, 24 Aug 2020 09:59:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 569012071E for ; Mon, 24 Aug 2020 09:59:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598263170; bh=vjHuSnYuW2muaJkLr+PczCtUfX2N8/c0OZkrLi6/es8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sK4q4vH1r07VJWNbP1i5WFbkth7CF+vxjGGO/K8R+x4mCXui9cn5y31XYUxlQxbHf Z3af5KW9CZyy/KT4vEdLgGW9a1LbJTT1vRhl7Zeqcjufr1kECRoJG47FMXnR+SdkWI ErqzXgnDk/fFMp1M+Ms6DNch146F07sP21xzNjY0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727050AbgHXJ7Z (ORCPT ); Mon, 24 Aug 2020 05:59:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:41170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727043AbgHXIda (ORCPT ); Mon, 24 Aug 2020 04:33:30 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 87AE0206F0; Mon, 24 Aug 2020 08:33:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598258010; bh=vjHuSnYuW2muaJkLr+PczCtUfX2N8/c0OZkrLi6/es8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TBLnqu324m7xC87Kr5QOYroRBX9BNuMWjwv4oRJAJTr8ocg6CknzOZEuGM8nZqc4G gC7B414fBiHEtUrtrVM9gGruR2zAXgmbNcxWrZvl3c4eyXQOKUAUw6AY8nhA/Wm6S2 SXLGz8r3QnY5XpppvGg0kSUZTsiLR1WrizVornlc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jaehyun Chung , Alvin Lee , Qingqing Zhuo , Alex Deucher Subject: [PATCH 5.8 040/148] drm/amd/display: Blank stream before destroying HDCP session Date: Mon, 24 Aug 2020 10:28:58 +0200 Message-Id: <20200824082415.969006363@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082413.900489417@linuxfoundation.org> References: <20200824082413.900489417@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jaehyun Chung commit 79940e4d10df9c737a394630968471c632246ee0 upstream. [Why] Stream disable sequence incorretly destroys HDCP session while stream is not blanked and while audio is not muted. This sequence causes a flash of corruption during mode change and an audio click. [How] Change sequence to blank stream before destroying HDCP session. Audio will also be muted by blanking the stream. Cc: stable@vger.kernel.org Signed-off-by: Jaehyun Chung Reviewed-by: Alvin Lee Acked-by: Qingqing Zhuo Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -3265,12 +3265,11 @@ void core_link_disable_stream(struct pip core_link_set_avmute(pipe_ctx, true); } + dc->hwss.blank_stream(pipe_ctx); #if defined(CONFIG_DRM_AMD_DC_HDCP) update_psp_stream_config(pipe_ctx, true); #endif - dc->hwss.blank_stream(pipe_ctx); - if (pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) deallocate_mst_payload(pipe_ctx);