From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C324C64EC4 for ; Fri, 10 Mar 2023 11:36:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230248AbjCJLgp (ORCPT ); Fri, 10 Mar 2023 06:36:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230458AbjCJLgf (ORCPT ); Fri, 10 Mar 2023 06:36:35 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3638775A44 for ; Fri, 10 Mar 2023 03:36:23 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C481661386 for ; Fri, 10 Mar 2023 11:36:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC7D8C433EF; Fri, 10 Mar 2023 11:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678448182; bh=Fn5KzQjEWWq43X81i14h+wUfhvA1/HIvVnPMogDpvNM=; h=Subject:To:Cc:From:Date:From; b=QWaSU7HWi4Gp2+HQRNUTOrKZYjcw/bg5C4MzCNO6zvxXP4ibC2JN4sS8sYQElWVTk Rrx/p4rFqUKxnNVZ7rB6IZSKjeoRw/iBBmFJ29fchglQzREFJflyBj0pYHUDRAACYv q/5wPk2kSre8xMqCSSvwQU5r9dkW6U3wkmKBkxc4= Subject: FAILED: patch "[PATCH] drm/amdgpu: skip MES for S0ix as well since it's part of GFX" failed to apply to 6.1-stable tree To: alexander.deucher@amd.com, mario.limonciello@amd.com Cc: From: Date: Fri, 10 Mar 2023 12:36:19 +0100 Message-ID: <1678448178119210@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 5620a1889e4ce248b0013123024bd4b20df8b56e # git commit -s git send-email --to '' --in-reply-to '1678448178119210@kroah.com' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 5620a1889e4c ("drm/amdgpu: skip MES for S0ix as well since it's part of GFX") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 5620a1889e4ce248b0013123024bd4b20df8b56e Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 16 Dec 2022 11:42:20 -0500 Subject: [PATCH] drm/amdgpu: skip MES for S0ix as well since it's part of GFX It's also part of gfxoff. Cc: stable@vger.kernel.org # 6.0, 6.1 Reviewed-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 582a80a9850e..e4609b8d574c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3018,14 +3018,15 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) continue; } - /* skip suspend of gfx and psp for S0ix + /* skip suspend of gfx/mes and psp for S0ix * gfx is in gfxoff state, so on resume it will exit gfxoff just * like at runtime. PSP is also part of the always on hardware * so no need to suspend it. */ if (adev->in_s0ix && (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP || - adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX)) + adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX || + adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_MES)) continue; /* SDMA 5.x+ is part of GFX power domain so it's covered by GFXOFF */