Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2637546pxa; Mon, 17 Aug 2020 15:07:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNwZJh3johWmqoiav3wZpNjD7I8/7XtZcoBVEyDfIdZWmrflhMG9AcxzLK0tq/3n56SYJo X-Received: by 2002:a17:906:d78c:: with SMTP id pj12mr16882830ejb.179.1597702059650; Mon, 17 Aug 2020 15:07:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597702059; cv=none; d=google.com; s=arc-20160816; b=z7f+TcB2BiK+I6r2zUSL7O5MBMKFcYvyO9vXB+F5pbctHAUty97xELp1C3RuQj8AxD pXxtxzZzrjaOhK5is12Msyp4eW1MjzUe6WzsnWMreXNVY4LB6ANQiKZO5X96yDvZlK6g NsQC/Ju5DwW/WZcgSZpmEakFdGThM4B0jKtmSn3jis/WLQQRGbFiWXa/28EpCADSK+GK fOgr+as2SGvQujYizuJNDxvLMniSE8JOXoOjFoY6PiRpIrn6P4IrUem/STjiqydFwfTS zbQkE4yyzO3ku97D0RWJk6Gfngla7DpkQiwXCcwS/8UifElYWLhLGsYzAw40Z3563UVj V39Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HXi67n8tNl5FLBos248nS7F6fBWPRnMrRXTeoaqtgD8=; b=DjwfWF99EmaMP6LpsoV7hfDxBoqwlvl5E19Z7TluJtPsM/R9vRXKXHbBxZbzgnfXoQ 7DloAKKI679g8GS13U4JTMWmLg+5OvQDuMyYib5/AuaNN4TIVQPoJGBiYv+wxIw9qcFe /y5IorJAC7AvnVdMlc38j/dS6Zi5Af9i1idG6E2QM+7oZ5w6XvQyuN14qdhBebJhHI/X 9w6aoIB2evMPSP0SOCKBXnUpFUw/NsbRQjZl3ckM2LP6rQeZkzu5ZqPygmCCWUdQIrNd cL4UT6LqUKtwA16Ev9InDLZXIiRT5i47g7CFEIvhn7JW0PoBV4XpOQEqlTtkGH6HehcJ uDLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oVcMbVvl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b6si12935041eja.208.2020.08.17.15.07.15; Mon, 17 Aug 2020 15:07:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oVcMbVvl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388590AbgHQQLE (ORCPT + 99 others); Mon, 17 Aug 2020 12:11:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:58238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730801AbgHQPq1 (ORCPT ); Mon, 17 Aug 2020 11:46:27 -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 5D8F72067C; Mon, 17 Aug 2020 15:46:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597679186; bh=5nvVShMLBwuUp6LU+hHsIvdvQMl7FDGzUFNL3/E2l6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oVcMbVvlVy3W4vHeWpx3Wp0gwpncIuwOjS10Dxo5OKdQ8t/pCuLypGyKrGMmmDR1F LtCd57qi3y7dEHx1tZJmBktRUdAv1d79I8USzKW4+bTL1ohzKPsMfQLrUhBc5imD24 c5BezZjuRbZP3cxp1kScuMlZ31fI9YT1IJd7ioEs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Evan Quan , Alex Deucher , Sasha Levin Subject: [PATCH 5.7 095/393] drm/amdgpu/display bail early in dm_pp_get_static_clocks Date: Mon, 17 Aug 2020 17:12:25 +0200 Message-Id: <20200817143824.235333380@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143819.579311991@linuxfoundation.org> References: <20200817143819.579311991@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Deucher [ Upstream commit 376814f5fcf1aadda501d1413d56e8af85d19a97 ] If there are no supported callbacks. We'll fall back to the nominal clocks. Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1170 Reviewed-by: Evan Quan Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c index a2e1a73f66b81..7cee8070cb113 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c @@ -530,6 +530,8 @@ bool dm_pp_get_static_clocks( &pp_clk_info); else if (adev->smu.ppt_funcs) ret = smu_get_current_clocks(&adev->smu, &pp_clk_info); + else + return false; if (ret) return false; -- 2.25.1