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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS 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 83BF9C43381 for ; Sun, 24 Feb 2019 13:57:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 53E4120663 for ; Sun, 24 Feb 2019 13:57:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551016628; bh=BilHrG5YPEZzITaiIYe9g8hFO/QnEEh6Vudy3/9xSj4=; h=Subject:To:Cc:From:Date:List-ID:From; b=GxDmwVIe8JsAaaDj8WUhuWaKQsMbbptI8NxnRw6rYVZyWKCSOqRS1ALzU/hbWsA5C ThHMbSQvB/JuCFePLefM8mPi34H1sLKKeyBGjjnzZ1VvKuvQH58TXWwTcH1fW/1g4S JvgCbyOwKKH3C/4bPsdY0X+0aZyIAJw4/PNaxodU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728229AbfBXN5H (ORCPT ); Sun, 24 Feb 2019 08:57:07 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:33817 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727594AbfBXN5H (ORCPT ); Sun, 24 Feb 2019 08:57:07 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 7468A20B1C; Sun, 24 Feb 2019 08:57:06 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sun, 24 Feb 2019 08:57:06 -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=fm2; bh=tV6ifB 4Yt/zLCwcPKXwLbeAy1b+gwf+pVk8H4JT2mpA=; b=NJ5r3EF6B6Gk2ktCg6Ho7g Tbp/O0AY5SUbvgGdljZbogA+t/Rrjj3y4WD5r2tt03RAVh5cmz6ZfLp1w4L3a4Op WGTFxo1g5EdCDdNfAdGvJxD7DU9S8qZ7bxGakpGbiUBA7AMgekrL8FyBAiu+K1yX wr7RsNXCcYahfkpmU20lK6y1p9SLr5IZ2IqIP0WFPUEII61wUaw4AS6mFJUgNpWD n7j3FYr110TqilnHGHw4qlnuP5UKnttFEzZN13MDdXuJIipKfPflHW5llMPVoqb7 oMeodtD+XC8PO4c8oNNF84CS1C+6LgT1Iubu4JVD42d+UXhzA5vAdtlWA5uxMl4w == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrudeggdehleculddtuddrgedtledrtddtmd cutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecukfhppeekfedrkeeirdekledruddtjeenucfrrghrrghmpehmrghilhhfrhhomh epghhrvghgsehkrhhorghhrdgtohhmnecuvehluhhsthgvrhfuihiivgepud X-ME-Proxy: Received: from localhost (5356596b.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id CE3A3E462B; Sun, 24 Feb 2019 08:57:05 -0500 (EST) Subject: FAILED: patch "[PATCH] drm/amd/display: set clocks to 0 on suspend on dce80" failed to apply to 4.20-stable tree To: Bhawanpreet.Lakha@amd.com, Nicholas.Kazlauskas@amd.com, alexander.deucher@amd.com, sunpeng.li@amd.com Cc: From: Date: Sun, 24 Feb 2019 14:57:04 +0100 Message-ID: <155101662498173@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.20-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 4ece61a22be5ab5d49cc5fc20a19a0afa24a019d Mon Sep 17 00:00:00 2001 From: Bhawanpreet Lakha Date: Tue, 5 Feb 2019 14:03:52 -0500 Subject: [PATCH] drm/amd/display: set clocks to 0 on suspend on dce80 [Why] When a dce80 asic was suspended, the clocks were not set to 0. Upon resume, the new clock was compared to the existing clock, they were found to be the same, and so the clock was not set. This resulted in a blackscreen. [How] In atomic commit, check to see if there are any active pipes. If no, set clocks to 0 Signed-off-by: Bhawanpreet Lakha Reviewed-by: Nicholas Kazlauskas Acked-by: Leo Li Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c index cdd1d6b7b9f2..4e9ea50141bd 100644 --- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c @@ -790,9 +790,22 @@ bool dce80_validate_bandwidth( struct dc *dc, struct dc_state *context) { - /* TODO implement when needed but for now hardcode max value*/ - context->bw.dce.dispclk_khz = 681000; - context->bw.dce.yclk_khz = 250000 * MEMORY_TYPE_MULTIPLIER_CZ; + int i; + bool at_least_one_pipe = false; + + for (i = 0; i < dc->res_pool->pipe_count; i++) { + if (context->res_ctx.pipe_ctx[i].stream) + at_least_one_pipe = true; + } + + if (at_least_one_pipe) { + /* TODO implement when needed but for now hardcode max value*/ + context->bw.dce.dispclk_khz = 681000; + context->bw.dce.yclk_khz = 250000 * MEMORY_TYPE_MULTIPLIER_CZ; + } else { + context->bw.dce.dispclk_khz = 0; + context->bw.dce.yclk_khz = 0; + } return true; }