Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3518191pxf; Mon, 15 Mar 2021 11:19:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHZ2PGFtr+Afxd87C500NVKSfWKICsK3BtR/A/O3YJqGaVfukpwbckoKRR460WLEw9J99K X-Received: by 2002:a05:6402:48c:: with SMTP id k12mr31611735edv.237.1615832368176; Mon, 15 Mar 2021 11:19:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615832368; cv=none; d=google.com; s=arc-20160816; b=VH1lkIeqhLsecn7KsobiibvT+kcw1i75KUg+lkBdW6/CH3wptm8XRl6jJlmwkvxSsI 6eXmmW1D5ocASwhgPOMjny4jY5r/RzCKbLb8wObFAmOTkh25HSvNYrgQ38yPP1SF/yJE w6UFKCiwwngpo+WsUvvQVVF8tFJ8y1WCmAPifPRslBKXhpKEvp7NRHHLp7fsuew3XCTa iiEN8H40p6QECK8VGQVGegKoyu3IE61yc0mkhL8HQxwIHxKwggGgFJiOv987XLycZcmJ k/oUfTx1UW3Jy+JLUF7K5M8u6jQxCDcciF4715A4hkqrQj/LKWrYwjEcuXw3mnTOyKh5 hHVg== 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=0UKdAMrKHlq53rR/gqwI31KE//AZK7IgIJSJGcFqsDw=; b=hGfPyH/4+Pyc2gOsatfU9ZPZ6mZbXaarfF1gmtaYq9yoi2agoTVnDzFzgqDV0B3uL/ Jk90gLMvj+ZxHnAhvHLa5CdjV09WnFqFhwN29fO6hK78zHGVLppqpTyEgsQdDiI8CM/w mwBvk8YDJkYVGY3mUVW+HsbirADQC2du1Rp2H0+TfOaSqrQrf+bjZnzymsVb8OOvN8pU WYyr2C+amHLjg0ZenAoJJbCeX9tt6hRU19ffLcKhT4a5ESeaSajsqRCbXNecHmFGnmkx L8m+pX7CfvsEMINVznMGVgVC9m4X1E35yxyIUy6YXsCjL7/lIV+o9CDk+05Tup7WR30s EZBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=avwUZaE8; 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 4si12699616edc.257.2021.03.15.11.19.04; Mon, 15 Mar 2021 11:19:28 -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=avwUZaE8; 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 S237442AbhCOORx (ORCPT + 99 others); Mon, 15 Mar 2021 10:17:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:35904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232733AbhCON7h (ORCPT ); Mon, 15 Mar 2021 09:59:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BB4AA64F3F; Mon, 15 Mar 2021 13:59:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816759; bh=5bpKe+F0fIdOCn/JmnKIYlziQBIDZdMJ1Hqho33wp70=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=avwUZaE8laE8ZL0DUOwXL09JDj/3bZnXx0mLa4k0YvjM8m4AEBwfJfiLT95pOt70Q Vckn48Y4cq5qRHnoH9YTqieMGEThUKRnZoUssdRuiFXI7n7IFijj5TC39HQ1mdsOlx Hf6NkSPVnNnnGfvxScmKstcgE/XUnO0ukQPwHlEg= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Prike Liang , Alex Deucher Subject: [PATCH 5.11 108/306] drm/amdgpu: fix S0ix handling when the CONFIG_AMD_PMC=m Date: Mon, 15 Mar 2021 14:52:51 +0100 Message-Id: <20210315135511.303313998@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135507.611436477@linuxfoundation.org> References: <20210315135507.611436477@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: Greg Kroah-Hartman From: Alex Deucher commit a5cb3c1a36376c25cd25fd3e99918dc48ac420bb upstream. Need to check the module variant as well. Acked-by: Prike Liang 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 @@ -903,7 +903,7 @@ void amdgpu_acpi_fini(struct amdgpu_devi */ bool amdgpu_acpi_is_s0ix_supported(struct amdgpu_device *adev) { -#if defined(CONFIG_AMD_PMC) +#if defined(CONFIG_AMD_PMC) || defined(CONFIG_AMD_PMC_MODULE) if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) { if (adev->flags & AMD_IS_APU) return true;