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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 5FBA0C2D0A3 for ; Tue, 3 Nov 2020 15:44:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 17803221FB for ; Tue, 3 Nov 2020 15:44:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604418297; bh=HnMlhb2VFMxpmBW0Rcu91eO5p/W43q+VDX1TL3hTDTg=; h=Subject:To:Cc:From:Date:List-ID:From; b=s2jEXE6ScSavR1JnvNhK8Sfx7qfMLf4/U94qcV8FAk8HGDjXpi2WTjsEjl1h5fqfk ar84aqWLduiS+sOggea5DnyB7jMj9eTFmdGAtYa+53FbYbYZlAGJVamczuF+NFW0my gietfpFbt8lB5JNhJj6JNRcmYUEelox56/Vvs2VA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727883AbgKCPo4 (ORCPT ); Tue, 3 Nov 2020 10:44:56 -0500 Received: from forward3-smtp.messagingengine.com ([66.111.4.237]:55591 "EHLO forward3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727470AbgKCPo4 (ORCPT ); Tue, 3 Nov 2020 10:44:56 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailforward.nyi.internal (Postfix) with ESMTP id 144531942BEB; Tue, 3 Nov 2020 10:44:55 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 03 Nov 2020 10:44:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=51pNoe ZiQOUSc8pnBCy0YZBtisyOGzLQGQ6Mw60c7Ik=; b=G2nnCTMrJZGyeJaF5Mj6SW jzg3VowblIEpYPnuj9SV1NfWi460UO/azBCYgoXt7Rd4CQhFLk1a1leG0CictC59 Eln00Mw/+6h/szfpFNyCDNYRyXUtz94lC3Tf2nmz907MxArp5FUk8aLqzzg6vyxf Z3wtVN/MhA+jGFTWlcx/ezSJbt4Mys5qLGno5sgZMhn8yKKnHwTafvLQype15Zd/ 4aeoNUj4UdDhjKT2p8V7Vlx3gDW8MLF3LvXvXcwZaUfNuooFl3ddRq2TUF1GXHA4 F6HiAcUyajzEviZX9feWdLzOpJK0Yr5VgHQ1MAZHZxDgdOf/DjHdwUCe5D0ohCrg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddtfedgjeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuggftrfgrthhtvghrnhepieetveehuedvhfdtgfdvieeiheehfeelveevheejud etveeuveeludejjefgteehnecukfhppeekfedrkeeirdejgedrieegnecuvehluhhsthgv rhfuihiivgepleenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrd gtohhm X-ME-Proxy: Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) by mail.messagingengine.com (Postfix) with ESMTPA id 762223064684; Tue, 3 Nov 2020 10:44:54 -0500 (EST) Subject: FAILED: patch "[PATCH] drm/amd/display: Blank stream before destroying HDCP session" failed to apply to 5.9-stable tree To: jaehyun.chung@amd.com, Alvin.Lee2@amd.com, alexander.deucher@amd.com, qingqing.zhuo@amd.com Cc: From: Date: Tue, 03 Nov 2020 16:45:45 +0100 Message-ID: <160441834515249@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 8db2d634ed29eeaed56fdbeaf63da7ae9e65280b Mon Sep 17 00:00:00 2001 From: Jaehyun Chung Date: Thu, 30 Jul 2020 16:31:29 -0400 Subject: [PATCH] drm/amd/display: Blank stream before destroying HDCP session [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 diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c index 4bd6e03a7ef3..117d8aaf2a9b 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -3286,12 +3286,11 @@ void core_link_disable_stream(struct pipe_ctx *pipe_ctx) 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);