From mboxrd@z Thu Jan 1 00:00:00 1970 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 33E1577117 for ; Wed, 19 Jun 2024 08:40:49 +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=1718786449; cv=none; b=q8y/ydI/vkrkpQqBLIGqpOcGaLjuKLdD/k9J/IKpRgCmp7qjKMJ/6VEUVJe3hiA4Yxyuhc93Zno9AV7w9jJA7R9ACGoAeOGSlXUuc83Yk6wNyBkWcakVh8/GcBDJFNOpjNXMVrQLXSNsKUaSACwJcZliX1im6HENfgfSRpM+FsY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718786449; c=relaxed/simple; bh=XzfTru8y16RAaS2AlmwFSBRHt6wqyNDr1w05po+h7cM=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Mor9ndSL01eQtZYD7Pg9wuoZgtpCyIiAB9RSqom0ArNoOr77GAe5+cTtjzLERsYczplxA/qq/kRyhFmOn4GKAwz2kU1WsZs1ujO5JF99gzgLQVMNRFVv5bp76ffVqxn3sNRNdEPoVaVBsbQQQXzIcqjxzW3+FCNG8WBTiU2wc2c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=scs9tNfC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="scs9tNfC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADD1BC2BBFC; Wed, 19 Jun 2024 08:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718786449; bh=XzfTru8y16RAaS2AlmwFSBRHt6wqyNDr1w05po+h7cM=; h=Subject:To:Cc:From:Date:From; b=scs9tNfCwJladoTVBEkVxBQGgT6dAFLMOUt35XHKaC3jv074pAgs60b9YGqPsQLcU wMAFPPPuOeO5YV5ig4oHOzlk+e9x7N64C06w8LebKDJBfF3zW+j4dfv6WSZEXHbYRC kSauQi9CIbq6ELVEsG55UP3y57yyNRsTlMoAK0Xc= Subject: FAILED: patch "[PATCH] drm/amd: Flush GFXOFF requests in prepare stage" failed to apply to 6.1-stable tree To: mario.limonciello@amd.com,alexander.deucher@amd.com,stable@vger.kernel.org Cc: From: Date: Wed, 19 Jun 2024 10:40:06 +0200 Message-ID: <2024061906-sepia-jaws-3711@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 0355b24bdec3b69ba31375c83d94fa80ca2c7ae1 # git commit -s git send-email --to '' --in-reply-to '2024061906-sepia-jaws-3711@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 0355b24bdec3 ("drm/amd: Flush GFXOFF requests in prepare stage") cb11ca3233aa ("drm/amd: Add concept of running prepare_suspend() sequence for IP blocks") 5095d5418193 ("drm/amd: Evict resources during PM ops prepare() callback") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 0355b24bdec3b69ba31375c83d94fa80ca2c7ae1 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Wed, 20 Mar 2024 13:32:21 -0500 Subject: [PATCH] drm/amd: Flush GFXOFF requests in prepare stage If the system hasn't entered GFXOFF when suspend starts it can cause hangs accessing GC and RLC during the suspend stage. Cc: # 6.1.y: 5095d5418193 ("drm/amd: Evict resources during PM ops prepare() callback") Cc: # 6.1.y: cb11ca3233aa ("drm/amd: Add concept of running prepare_suspend() sequence for IP blocks") Cc: # 6.1.y: 2ceec37b0e3d ("drm/amd: Add missing kernel doc for prepare_suspend()") Cc: # 6.1.y: 3a9626c816db ("drm/amd: Stop evicting resources on APUs in suspend") Cc: # 6.6.y: 5095d5418193 ("drm/amd: Evict resources during PM ops prepare() callback") Cc: # 6.6.y: cb11ca3233aa ("drm/amd: Add concept of running prepare_suspend() sequence for IP blocks") Cc: # 6.6.y: 2ceec37b0e3d ("drm/amd: Add missing kernel doc for prepare_suspend()") Cc: # 6.6.y: 3a9626c816db ("drm/amd: Stop evicting resources on APUs in suspend") Cc: # 6.1+ Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3132 Fixes: ab4750332dbe ("drm/amdgpu/sdma5.2: add begin/end_use ring callbacks") Reviewed-by: Alex Deucher Signed-off-by: Mario Limonciello Signed-off-by: Alex Deucher diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index f771b2042a43..12dc71a6b5db 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -4542,6 +4542,8 @@ int amdgpu_device_prepare(struct drm_device *dev) if (r) goto unprepare; + flush_delayed_work(&adev->gfx.gfx_off_delay_work); + for (i = 0; i < adev->num_ip_blocks; i++) { if (!adev->ip_blocks[i].status.valid) continue;