From patchwork Sun Apr 10 14:26:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 1615419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=s7oLYaa5; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KbvS96V5xz9sGP for ; Mon, 11 Apr 2022 00:26:32 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ndYWE-000634-RF; Sun, 10 Apr 2022 14:26:22 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ndYWD-00062l-50 for kernel-team@lists.ubuntu.com; Sun, 10 Apr 2022 14:26:21 +0000 Received: from HP-EliteBook-840-G7.. (36-229-234-223.dynamic-ip.hinet.net [36.229.234.223]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id EB02A41DC2 for ; Sun, 10 Apr 2022 14:26:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1649600780; bh=kOukxD5LC7oUffhNCxgPm9fbA1glg3ojDLEENbRy8y8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=s7oLYaa5cnAfVEQ5oYuTBwBkWMXe0K7rPpCgrhHAgxcUBPpRRpD0mArUdB8137Q8R T0CE/aSFwHm9DKEoSYouW2PKkdE5Ho4UDMtnrSni3rHyOfF9qQxLt0EsN71NGiGust sly6OZB26uAvTYR1evfwsMNILj99qkX8miRGI5BvVbsotfXlKSu521zarX3LiNeOsA MWTTIiRKF3mrVbJWzQ3SI4yoKmbRWfIu691u73yhaRf5gFJwehnLgH6RNtpOOKOYxx FabMiK1o1oik7xfKty2LTJJHzw95AFi2UcUfQyyabc6x2HDaRw+cVW/fkQgqSysTn6 hCc9bfpOEev7w== From: Kai-Heng Feng To: kernel-team@lists.ubuntu.com Subject: [J/OEM-5.14] [PATCH 1/3] drm/amdgpu: don't set s3 and s0ix at the same time Date: Sun, 10 Apr 2022 22:26:07 +0800 Message-Id: <20220410142609.127462-2-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220410142609.127462-1-kai.heng.feng@canonical.com> References: <20220410142609.127462-1-kai.heng.feng@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Mario Limonciello BugLink: https://bugs.launchpad.net/bugs/1968475 This makes it clearer which codepaths are in use specifically in one state or the other. Signed-off-by: Mario Limonciello Acked-by: Evan Quan Signed-off-by: Alex Deucher (cherry picked from commit eac4c54bf7f17fb4681b85e5fe383b74d6261a2b) Signed-off-by: Kai-Heng Feng --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 5a7fef324c820..078674f78f50e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2250,9 +2250,9 @@ static int amdgpu_pmops_suspend(struct device *dev) if (amdgpu_acpi_is_s0ix_active(adev)) adev->in_s0ix = true; - adev->in_s3 = true; + else + adev->in_s3 = true; r = amdgpu_device_suspend(drm_dev, true); - adev->in_s3 = false; if (r) return r; if (!adev->in_s0ix) @@ -2269,6 +2269,8 @@ static int amdgpu_pmops_resume(struct device *dev) r = amdgpu_device_resume(drm_dev, true); if (amdgpu_acpi_is_s0ix_active(adev)) adev->in_s0ix = false; + else + adev->in_s3 = false; return r; }