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=-10.0 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=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 38471C433EA for ; Tue, 14 Jul 2020 14:02:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1523822267 for ; Tue, 14 Jul 2020 14:02:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594735354; bh=0JzuRfenXUEUvW80CsIttkY/5yR9gAOTtiwBRIhqvzk=; h=Subject:To:Cc:From:Date:List-ID:From; b=iZG0A9d/Xg/wkxS1DOeatgjAr2qTxG6hWGTVpGugrvzLUgsGXN9oTjLxkBxU+2Gbn I/4MA8nNmWsfaxzjpUfL9PyODUp7HOjJ4ZM1SJfghov46w3IwTQv61st4wly7cC4j+ dkVKAGLGPFXY0PEtXGYJWK1UFpN/rzOrEWLZM4F4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727863AbgGNOCd (ORCPT ); Tue, 14 Jul 2020 10:02:33 -0400 Received: from wforward2-smtp.messagingengine.com ([64.147.123.31]:58137 "EHLO wforward2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726762AbgGNOCd (ORCPT ); Tue, 14 Jul 2020 10:02:33 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.west.internal (Postfix) with ESMTP id 6144C9AE5; Tue, 14 Jul 2020 10:02:32 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Tue, 14 Jul 2020 10:02:32 -0400 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=fm3; bh=8O/VVw 9z3H5OFgbjRd+tLf3o2F5nVKNiM15dYrKIXio=; b=UsZkwpLQ6XFyUsa0QxXCr7 Gzfo6U/wB10RQaCo4nfw+D6aD2S7sEpV8EavrIE0dEO7SjyXxBQtCm8TIh0q+gCO ttIz1V17/EH5F5dmWchZv0a4VsmhMlu+LuAnBoXKp1QTLhYrNvFdMVXG+xq7M77E iha8vbnY40hTENIsYrwmkC6vRmS7IjTPfGIW+P7H2kxkYfhUhefdT3PAQpOT/arW qt2EEx7Zr4gBEouoS+Yf9zybBe756mu9p6UzkLeW5tn4tIRJWML2cTMDDOEW+mkW jswkF/tWkVchvnrVH16f4cwRbJjadARoU3zegbvvRUHTEcTweRPjvDkRuk7xbGnA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrfedtgdejgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttd flnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhg qeenucggtffrrghtthgvrhhnpeelleelvdegfeelledtteegudegfffghfduffduudekge efleegieegkeejhfelveenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecukfhppeek fedrkeeirdekledruddtjeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmh grihhlfhhrohhmpehgrhgvgheskhhrohgrhhdrtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 9E1E030600A3; Tue, 14 Jul 2020 10:02:31 -0400 (EDT) Subject: FAILED: patch "[PATCH] drm/amd/display: add dmcub check on RENOIR" failed to apply to 5.4-stable tree To: aaron.ma@canonical.com, alexander.deucher@amd.com, nicholas.kazlauskas@amd.com Cc: From: Date: Tue, 14 Jul 2020 16:02:22 +0200 Message-ID: <159473534221103@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 5.4-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 3b2e973dff59d88bee1d814ddf8762a24fc02b60 Mon Sep 17 00:00:00 2001 From: Aaron Ma Date: Wed, 8 Jul 2020 04:16:22 -0400 Subject: [PATCH] drm/amd/display: add dmcub check on RENOIR RENOIR loads dmub fw not dmcu, check dmcu only will prevent loading iram, it breaks backlight control. Bug: https://bugzilla.kernel.org/show_bug.cgi?id=208277 Acked-by: Alex Deucher Reviewed-by: Nicholas Kazlauskas Signed-off-by: Aaron Ma Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 10ac8076d4f2..db5e0bb0d935 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1358,7 +1358,7 @@ static int dm_late_init(void *handle) struct dmcu *dmcu = NULL; bool ret; - if (!adev->dm.fw_dmcu) + if (!adev->dm.fw_dmcu && !adev->dm.dmub_fw) return detect_mst_link_for_all_connectors(adev->ddev); dmcu = adev->dm.dc->res_pool->dmcu;