From patchwork Mon Jun 16 17:50:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 897316 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 917B0288C12; Mon, 16 Jun 2025 17:50:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750096237; cv=none; b=e1ekZtNz7jp0+6jsSXyqefsWsHITbffyT+6sF4msaryeQsajyLPDp8i1+6MPeSfMHcJ+Hqpvb7lxkihJjjYV8OgY3Ahl3IJfgWYOzxfn+UgTX2tT6ayVYsnWBqTrhSlLWL1kCrB63/xmp6hFzc1oRMoYMklVslOVKAOOHSC6UTQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750096237; c=relaxed/simple; bh=EYdTArwvin65wexM18vPdaMIRqB0lvbLE4DDyu8zn9s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QYqFi1VRyH8e450GBxGDYK0PkWdcOHEhd44Oq+9WmyksiCu+FAo8oM9HPjIo4VO7KFXbuo+hZWICIxOU0/YHuhPA/f6jwSAmg3MxOH4/Yvb5yhYnp7x2uxf7Gh65017CY1eGf2nz6AUMryZl9Vxhck3RfhSWKZNeyr4Qctrf5Xs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Lz69+ILc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Lz69+ILc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5BC6CC4CEEE; Mon, 16 Jun 2025 17:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750096237; bh=EYdTArwvin65wexM18vPdaMIRqB0lvbLE4DDyu8zn9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lz69+ILcUuW20dCmN1poltLdx3jHTjFuwNxjysxjh9HKN99J4nnLGkDxnl2O8sSWq GD/ai/Wx01l2Xu3m5hHjOnDtU1Ulgo2NWQaSdWNdC/UsRJg0gsRk3TPPLQMrZgs3bj xJlN2rDUmCe8YgjRmvg+Wplm58bA47FO1fWVGjToAIVCvsBCUk4xtxxbPuiBS8KoHD TVbt+RmJssWrj0TdRCD0ODjeY7OPEKJ96hErIZU4Yp9gkJyx2VHLG0v8mRYliXpjzy dECJR74IrtAV8DKICBdt6a10wV0HgL1kr/jWC76bQUdMNjpwBaHDUcSPsUMh/WIm6f RP9Jkjv7DdPYw== From: Mario Limonciello To: "Rafael J . Wysocki" , Alex Deucher , Bjorn Helgaas Cc: amd-gfx@lists.freedesktop.org (open list:RADEON and AMDGPU DRM DRIVERS), linux-pm@vger.kernel.org (open list:HIBERNATION (aka Software Suspend, aka swsusp)), linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM), linux-kernel@vger.kernel.org (open list), Greg Kroah-Hartman , Danilo Krummrich , "James E . J . Bottomley" , "Martin K . Petersen" , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-scsi@vger.kernel.org (open list:SCSI SUBSYSTEM), linux-usb@vger.kernel.org (open list:USB SUBSYSTEM), Mario Limonciello , AceLan Kao , Kai-Heng Feng , Mark Pearson , Denis Benato , =?utf-8?q?Merthan_Karaka=C5=9F?= Subject: [PATCH v4 3/5] drm/amd: Avoid evicting resources at S5 Date: Mon, 16 Jun 2025 12:50:17 -0500 Message-ID: <20250616175019.3471583-4-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250616175019.3471583-1-superm1@kernel.org> References: <20250616175019.3471583-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Mario Limonciello Normally resources are evicted on dGPUs at suspend or hibernate and on APUs at hibernate. These steps are unnecessary when using the S4 callbacks to put the system into S5. Cc: AceLan Kao Cc: Kai-Heng Feng Cc: Mark Pearson Cc: Denis Benato Cc: Merthan Karakaş Signed-off-by: Mario Limonciello --- v3: https://lore.kernel.org/linux-pm/20250609024619.407257-1-superm1@kernel.org/T/#me6db0fb946e3d604a8f3d455128844ed802c82bb --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 8edd88328749b..c5d8f6d551238 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -4966,6 +4966,10 @@ static int amdgpu_device_evict_resources(struct amdgpu_device *adev) if (!adev->in_s4 && (adev->flags & AMD_IS_APU)) return 0; + /* No need to evict when going to S5 through S4 callbacks */ + if (system_state == SYSTEM_HALT || system_state == SYSTEM_POWER_OFF) + return 0; + ret = amdgpu_ttm_evict_resources(adev, TTM_PL_VRAM); if (ret) DRM_WARN("evicting device resources failed\n");