Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4576888pxv; Tue, 6 Jul 2021 04:28:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysOorwyGWf7CsrsftNBVpnCMudzhEkubi+X9sE4CyCjl5YcniMy+d5nKLei7NAhBuselNr X-Received: by 2002:a02:a48d:: with SMTP id d13mr7624923jam.28.1625570925935; Tue, 06 Jul 2021 04:28:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570925; cv=none; d=google.com; s=arc-20160816; b=zdjzTfwtNxFQGCUWGVNsMhHwe6zqE5fbnFinEn5q7fA/S2xrdI0MeolgJAKvGgFq4o vPj6dMSB/3TwhVI8wU3WnMwZsdgk3Ah+JhF/Pj8y2mkZAgG24wKC48rHYkFUmHstAcuf +EFCMfXuCvQISNMJdz5ToM8dmrQZufYd5ZE+mwQVbASnU49K2gE7y/1bGV7767h6roIr haWEG2f6/ytLJvfMez3hc285V8CXQhjP1hmEvuq5r0DWmEH8DEQfvgElCgklBdjFBz4y 030vDHWS89cANCafKFmkAoyRh3RJ9JJpwS4Mhwx/V0cmW+BmKp8LkCovfbAgb7SPTXjJ EWNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KB+SnHx3Yq4uRjd34AaME/oZWhm7mEHduINGz6N4V0g=; b=Ak42HjCCkcMKCe8Wa1XYASp3Rxej2+Pcpna0pbdN0j15DWfJBUuEVAYHV28elsVSR3 Nbmiy/hL0gMrBnGYLApmbTcV3gWbbvpsPb1u/sjJF7pOhuoFOU58RpmpFAX6FNSk8WQF i8aDlqX1291Yzaa0Hev9DMVwoNnsYir7BVw8AWtFdlczz+KvxPSV2bzFxHdnbqK44w/Z xpTxpYleoEfK/cp3yyh1YYP9sPV8KOBZImXm8IDGUXBQvPFAcFaabxw+xK9grpyrKlKa 3YEABb4GtkcawGEqEQGvfL6Ym4+e4EuPMh3ugTPJwl427OimCdJNvyLyaw3kEhufzAgQ 1k4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="faFK7j/l"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g9si15455149ioc.100.2021.07.06.04.28.33; Tue, 06 Jul 2021 04:28:45 -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=k20201202 header.b="faFK7j/l"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233404AbhGFLaj (ORCPT + 99 others); Tue, 6 Jul 2021 07:30:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:53758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232277AbhGFLSA (ORCPT ); Tue, 6 Jul 2021 07:18:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4CC5361C5C; Tue, 6 Jul 2021 11:15:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570122; bh=yYQX/l86/tT//dk9dZb0R3ZlXb4iOuPLeiwiA8cA/Ds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=faFK7j/lIQIxBvz/+HSdBQsfwQhiDzhoSVbvaIkFjUnEzXy8Ye8GSNaCuPjDPJ6K8 D+UWLuQ1Sp0aASvV6u98ZzhuR0kGk/eedSEuis4xYobV4IIzRhpJmV34D29Y5FtTyj 3S0vh0Dy9D2VPhmdz6Vc9Y8/wjVufdaXZ13sf6VhP3nXtfJtYC3vsyJdgoCWCkaJbp OsRHCJh0UGUjmLRgLmx1QHd8CjlZ/ifoU/GVzN4R0MpBFwKG5y9PPnO/xdyKLVWLkp Je57xGQwFN2Iz5vNXD4t/0QPHEBxEbmP0jcJO273j2vesfCV2xQjVj5x/WvYOIwJAd 3iGSsWErWU66Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , Lijo Lazar , Lee Jones , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.13 051/189] drm/amdgpu/swsmu/aldebaran: fix check in is_dpm_running Date: Tue, 6 Jul 2021 07:11:51 -0400 Message-Id: <20210706111409.2058071-51-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Deucher [ Upstream commit dd1d82c04e111b5a864638ede8965db2fe6d8653 ] If smu_cmn_get_enabled_mask() fails, return false to be consistent with other asics. Reviewed-by: Lijo Lazar Signed-off-by: Alex Deucher Cc: Lee Jones Reviewed-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c index 16ad4683eb69..0d2f61f56f45 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c @@ -1290,10 +1290,13 @@ static int aldebaran_usr_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_ static bool aldebaran_is_dpm_running(struct smu_context *smu) { - int ret = 0; + int ret; uint32_t feature_mask[2]; unsigned long feature_enabled; + ret = smu_cmn_get_enabled_mask(smu, feature_mask, 2); + if (ret) + return false; feature_enabled = (unsigned long)((uint64_t)feature_mask[0] | ((uint64_t)feature_mask[1] << 32)); return !!(feature_enabled & SMC_DPM_FEATURE); -- 2.30.2