Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3775804pxt; Tue, 10 Aug 2021 11:03:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZwVyDhROI7DYGv8COAAj1CjJWmZuawiMWAUd7dOoQZC/eUiCYutIIt2dmVyxnIUGq2WQJ X-Received: by 2002:a05:6402:184b:: with SMTP id v11mr6417915edy.267.1628618618971; Tue, 10 Aug 2021 11:03:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628618618; cv=none; d=google.com; s=arc-20160816; b=kk81R2pNtvkXCZp/BRWo99ONjlrW6yfglOTyh9kWG8q6z28wVWsGBa+A2EhOGiZWzl nlMTRBnaNuBUQSMC6C4CmIU1NfSNFtKfh+TW1B18d1LHv5ANKEr7hd4ADOkUYncGGl9n F9NPqMv/YU+IjCmd59BUKxCI4j3WkBLHOBXccITHwKq3qZvNm3hRUrjzWXM6QM5VATZ2 VCHzfTAB6lIPoggDai4GgGuSv0DxNAj90/Wz5fUqLT2Huh4Q8vusZzFDpHkHr3tuqOzd R1LtvHhGk1UCl1tZDaqAcIViNnuzrVQNWRUoc6K8WnQ1hfYjSxZQxsryOZS0ilqya++X j13w== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uVMtspzsENut7RK4C0Kf7Mic3k00tlxLIcQGEsgXxtM=; b=eWi5QJskvhWyJpwuE073wpG9t8B+CvXcMuL7bwoDwPFJulkxh3qwM+tWfqXnKcg6dx vy57hYrbt/DbSMHwGkB2nuTcYRLvGJWITXzmjtwUp1cqiLeYOIqvD11iyfcPqZNhN1PY YbcLFtFDBiHQ1rIUZy3tNM/Y2E73wTQoEVNsKvurM+sLe6H4L2CYdl5TxsHVHUysWki8 vmTH73/hCU2wpeXZzYzss3sMlrdzZpQDAeHSwsab64pGUFAngKIZlWC4jy8D6NmqLyun 3vcRN9yluzAbfjPZE4L7PzDUych21TIQyPnuoIBKvqsmBeljaOai6YiuICh18RfVqeD8 2aRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hpdBici9; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 18si25451376ejc.508.2021.08.10.11.03.14; Tue, 10 Aug 2021 11:03:38 -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=@linuxfoundation.org header.s=korg header.b=hpdBici9; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237712AbhHJSB7 (ORCPT + 99 others); Tue, 10 Aug 2021 14:01:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:57246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236861AbhHJRzs (ORCPT ); Tue, 10 Aug 2021 13:55:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1492D6101E; Tue, 10 Aug 2021 17:44:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617489; bh=U87jz2yLDcnwlfFLRwK6RNCPjxBmNIr2x/Ym20ZB4+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hpdBici9wKHC7aK6LzQAvZvq/fRvh5KmuQVR6ngcRgsjKj6jsIADV909tVrAaOd/o EksA77uf0V3RAlw1/hp0pk19PZ9K7qbS4YBaJ7xbMn/KDVb/wd103q0bw179MeO6he gXr6T4VTGP9HV1n26ojLuQksuAYakHwG9YoI59cU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-next@vger.kernel.org Subject: [PATCH 5.13 081/175] drm/amdgpu: fix checking pmops when PM_SLEEP is not enabled Date: Tue, 10 Aug 2021 19:29:49 +0200 Message-Id: <20210810173003.613302353@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810173000.928681411@linuxfoundation.org> References: <20210810173000.928681411@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap commit 5706cb3c910cc8283f344bc37a889a8d523a2c6d upstream. 'pm_suspend_target_state' is only available when CONFIG_PM_SLEEP is set/enabled. OTOH, when both SUSPEND and HIBERNATION are not set, PM_SLEEP is not set, so this variable cannot be used. ../drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c: In function ‘amdgpu_acpi_is_s0ix_active’: ../drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c:1046:11: error: ‘pm_suspend_target_state’ undeclared (first use in this function); did you mean ‘__KSYM_pm_suspend_target_state’? return pm_suspend_target_state == PM_SUSPEND_TO_IDLE; ^~~~~~~~~~~~~~~~~~~~~~~ __KSYM_pm_suspend_target_state Also use shorter IS_ENABLED(CONFIG_foo) notation for checking the 2 config symbols. Fixes: 91e273712ab8dd ("drm/amdgpu: Check pmops for desired suspend state") Signed-off-by: Randy Dunlap Cc: Alex Deucher Cc: Christian König Cc: "Pan, Xinhui" Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c @@ -904,7 +904,7 @@ void amdgpu_acpi_fini(struct amdgpu_devi */ bool amdgpu_acpi_is_s0ix_supported(struct amdgpu_device *adev) { -#if defined(CONFIG_AMD_PMC) || defined(CONFIG_AMD_PMC_MODULE) +#if IS_ENABLED(CONFIG_AMD_PMC) && IS_ENABLED(CONFIG_PM_SLEEP) if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) { if (adev->flags & AMD_IS_APU) return pm_suspend_target_state == PM_SUSPEND_TO_IDLE;