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 0BE291DFFA for ; Sat, 27 Jan 2024 22:37:53 +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=1706395074; cv=none; b=fBsfwTkCtDxFAR5Gckx0Y3b4/P1PTYg3mX/HvxVW0F5fr8NiCYJkSgMkfwRYKxOyYfagYv1oE0xT5TDYR9FyDgadwxU7SNTIb8RzY0bM6ZVRAqkaxc40HbtnPEiPsyfIVfOZwQyuF70HEX8Jzy2aYGICCdgWw6OydryUOGsv+Xg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706395074; c=relaxed/simple; bh=HPMlK+CCRyY1j2SlYCH+cWXLwTI3ln9ShVrPtICDni8=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=e59uRQCYFLHIV0fGCgrrRnN0taWJ8xKZr5chBXDXscEHTX2BSxlTqaZWSXrpnr+iRN2JdQgYBY58WoA1K/+QdNiny/jqnK+cH/wkgMfd4dwVq6moMfQxMC+fLbKB/ls/yWLSGKn7wQoMh0MjL64XFepCxWEHle4svRMz1QKgiOA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=keT77Gsr; 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="keT77Gsr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9DAC0C433C7; Sat, 27 Jan 2024 22:37:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706395073; bh=HPMlK+CCRyY1j2SlYCH+cWXLwTI3ln9ShVrPtICDni8=; h=Subject:To:Cc:From:Date:From; b=keT77GsrTCiCyLxc/W4MfpZydISlOpu2jLRQR2hAzUMpog2B53sxF4PJKf9H9wLd2 hmNu0gxVk1KZdfmQVTsz1QrtlcL3gOPXEFcdxSpKhalk4U4T7RvRiceIh+2T3DR2Mf FJSpdFlZecWs6mpgtAULBl8bzNt6Wv5/QYlwns20= Subject: FAILED: patch "[PATCH] drm/amdgpu: disable MCBP by default" failed to apply to 6.6-stable tree To: Jiadong.Zhu@amd.com,alexander.deucher@amd.com Cc: From: Date: Sat, 27 Jan 2024 14:37:52 -0800 Message-ID: <2024012752-bouncy-tag-0b1e@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.6-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.6.y git checkout FETCH_HEAD git cherry-pick -x fd2ef5fa3556549c565f5b7a07776d899a8ed8b7 # git commit -s git send-email --to '' --in-reply-to '2024012752-bouncy-tag-0b1e@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: fd2ef5fa3556 ("drm/amdgpu: disable MCBP by default") 4e8303cf2c4d ("drm/amdgpu: Use function for IP version check") 6b7d211740da ("drm/amdgpu: Fix refclk reporting for SMU v13.0.6") 1b8e56b99459 ("drm/amdgpu: Restrict bootloader wait to SMUv13.0.6") 983ac45a06ae ("drm/amdgpu: update SET_HW_RESOURCES definition for UMSCH") 822f7808291f ("drm/amdgpu/discovery: enable UMSCH 4.0 in IP discovery") 3488c79beafa ("drm/amdgpu: add initial support for UMSCH") 2da1b04a2096 ("drm/amdgpu: add UMSCH 4.0 api definition") 3ee8fb7005ef ("drm/amdgpu: enable VPE for VPE 6.1.0") 9d4346bdbc64 ("drm/amdgpu: add VPE 6.1.0 support") e370f8f38976 ("drm/amdgpu: Add bootloader wait for PSP v13") aba2be41470a ("drm/amdgpu: add mmhub 3.3.0 support") 15e7cbd91de6 ("drm/amdgpu/gfx11: initialize gfx11.5.0") f56c1941ebb7 ("drm/amdgpu: use 6.1.0 register offset for HDP CLK_CNTL") 15c5c5f57514 ("drm/amdgpu: Add bootloader status check") 3cce0bfcd0f9 ("drm/amd/display: Enable Replay for static screen use cases") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From fd2ef5fa3556549c565f5b7a07776d899a8ed8b7 Mon Sep 17 00:00:00 2001 From: Jiadong Zhu Date: Fri, 1 Dec 2023 08:38:15 +0800 Subject: [PATCH] drm/amdgpu: disable MCBP by default Disable MCBP(mid command buffer preemption) by default as old Mesa hangs with it. We shall not enable the feature that breaks old usermode driver. Fixes: 50a7c8765ca6 ("drm/amdgpu: enable mcbp by default on gfx9") Signed-off-by: Jiadong Zhu Acked-by: Alex Deucher Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 6c0cf64d465a..d5b950fd1d85 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3861,10 +3861,6 @@ static void amdgpu_device_set_mcbp(struct amdgpu_device *adev) adev->gfx.mcbp = true; else if (amdgpu_mcbp == 0) adev->gfx.mcbp = false; - else if ((amdgpu_ip_version(adev, GC_HWIP, 0) >= IP_VERSION(9, 0, 0)) && - (amdgpu_ip_version(adev, GC_HWIP, 0) < IP_VERSION(10, 0, 0)) && - adev->gfx.num_gfx_rings) - adev->gfx.mcbp = true; if (amdgpu_sriov_vf(adev)) adev->gfx.mcbp = true;