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 B132AC388F7 for ; Tue, 3 Nov 2020 15:43:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7127720780 for ; Tue, 3 Nov 2020 15:43:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604418216; bh=yHb5wvA5qMCeUM90shcpKPZFJirRPgel0Z1Z1HlG4gk=; h=Subject:To:Cc:From:Date:List-ID:From; b=U6wM2Qgmn0XifEoLPbZDNEjgHTIyRG2PZuBXK9HG/eT3XdrLsBR7Fk6nfCvy7VraS rRtHzm1aYJv43nAFfOXe+ShQx3OwHmmHmCmfgDLbFMWTzr8ttE+QAR0+xZSJbZICJT bWqEBG9GwnDgfco/AtxudaIOaQ8mIsZEE0hVUi2Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726690AbgKCPng (ORCPT ); Tue, 3 Nov 2020 10:43:36 -0500 Received: from forward3-smtp.messagingengine.com ([66.111.4.237]:44919 "EHLO forward3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727923AbgKCPng (ORCPT ); Tue, 3 Nov 2020 10:43:36 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailforward.nyi.internal (Postfix) with ESMTP id 925211942AFB; Tue, 3 Nov 2020 10:43:34 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 03 Nov 2020 10:43:34 -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=BHyFZ8 //ML6QbrLVnFEquFg++BYUAnibKu6LXFEPrVM=; b=GjBJoCFnNtG0N98ctcg9jI pqxu5NLNyiGsicPSGIIR8Lf+Xm6I/7xqr3Rq8GddrE4AMNobKoeAsEsulVPm7EZS I8YY0j4c5YQqhlzP3GZkZBTO3ZolDl9hSWbZ0A2mtmVRfoymlUdTfk3csz0FmMXX fChj0zXSNWKkTGgK7Ip3R8fwaB5Hz5hzwoDbx77epnIoRUpkC3JUxCq1OBIWhd8X 9zeEMtkhwNEoCwcttk1JEKJWrvpOHyyz2lJ6AoQHuEJWe/PtemNUfBsq/MpMDTku hbreX4+Rqdy3RVEvIwviZ8TUT+7WRCGzHzcuCSY58utFi+a0AT3/nYVzvL009ORQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddtfedgjeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuggftrfgrthhtvghrnhepieetveehuedvhfdtgfdvieeiheehfeelveevheejud etveeuveeludejjefgteehnecukfhppeekfedrkeeirdejgedrieegnecuvehluhhsthgv rhfuihiivgepheenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrd 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 159DA3064683; Tue, 3 Nov 2020 10:43:33 -0500 (EST) Subject: FAILED: patch "[PATCH] drm/amd/display: [FIX] update clock under two conditions" failed to apply to 5.9-stable tree To: Lewis.Huang@amd.com, Martin.Leung@amd.com, Qingqing.zhuo@amd.com, alexander.deucher@amd.com, stable@vger.kernel.org Cc: From: Date: Tue, 03 Nov 2020 16:44:27 +0100 Message-ID: <16044182673022@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 12dbd1f7578feb51bc95e5a90eb617889cc0b04e Mon Sep 17 00:00:00 2001 From: Lewis Huang Date: Wed, 16 Sep 2020 17:13:11 -0400 Subject: [PATCH] drm/amd/display: [FIX] update clock under two conditions [Why] Update clock only when non-seamless boot stream exists creates regression on multiple scenerios. [How] Update clock in two conditions 1. Non-seamless boot stream exist. 2. Stream_count = 0 Fixes: 598c13b21e25 ("drm/amd/display: update clock when non-seamless boot stream exist") Signed-off-by: Lewis Huang Reviewed-by: Martin Leung Acked-by: Qingqing Zhuo Signed-off-by: Alex Deucher Cc: diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 1efc823c2a14..7e74ddc1c708 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -1286,7 +1286,8 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c dc->optimize_seamless_boot_streams++; } - if (context->stream_count > dc->optimize_seamless_boot_streams) + if (context->stream_count > dc->optimize_seamless_boot_streams || + context->stream_count == 0) dc->hwss.prepare_bandwidth(dc, context); disable_dangling_plane(dc, context); @@ -1368,7 +1369,8 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c dc_enable_stereo(dc, context, dc_streams, context->stream_count); - if (context->stream_count > dc->optimize_seamless_boot_streams) { + if (context->stream_count > dc->optimize_seamless_boot_streams || + context->stream_count == 0) { /* Must wait for no flips to be pending before doing optimize bw */ wait_for_no_pipes_pending(dc, context); /* pplib is notified if disp_num changed */