From nobody Mon May 13 23:05:18 2024 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 6553815ADAA; Wed, 27 Mar 2024 12:18:03 +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=1711541883; cv=none; b=Ib96CGkuPU7EmccF54an05yShj0rqBc0PY+DSQ6MpBGA+sdZhj/nJFX3bzYv3ggBTDO8Cnkk9peBG277OYGqGiE4+FIv63aNFVgZvGMXxPeZgUwppv95loCGwKT/Os2/8jPJ44qQpCYQbCZigs/VAMV0ZaHF6D/+Q47lhwixHJg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541883; c=relaxed/simple; bh=9Yi0T0LkSLpTnLQ/txC1nQOT89nbA/ndE+6gRJjYopY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=NGOp+rXbHX3Y9u+ADzwfuyQLu04WSFAS6fpMvVIh0oWN+RNtjHbabh7Bpo9+Be3mbHpmY0VAzVKilDXWEXNJcG8njAO+KkXtjogouzNZ5KBrHSVaZlWhKIjReSuZtq0lJJGOkO122ZnSLuMMIOCleXUAqArE77Gvcoryzr0AxIg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FGUDB47Y; 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="FGUDB47Y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88747C43390; Wed, 27 Mar 2024 12:18:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711541883; bh=9Yi0T0LkSLpTnLQ/txC1nQOT89nbA/ndE+6gRJjYopY=; h=From:To:Cc:Subject:Date:From; b=FGUDB47YoB8znILVgtFpbYkDWEIyW2nIQraYPPCLJ0LuGQRb87ShYs3CPYktrJ8tA cN47HgQN9USEF2F7Sym5+vrbnqRuORiu/TSWF+KFcfvFZ81yPPsT31aizX1dchjLgA 784vrTUrtSCyOUYHbXsaShyLCbKDWK/dCWXaIaNwkdQVW6f1ur/ahiJuCqCAki+jRR jUhnkbyHV9FYhyE/Ozyzz0i9JJA40vxPnVRG+4WLuvezt++Ne3lx59txJ/V1WUdcbH H0HcGLfVzG9xo+rK1rqsLRPW9rl/MKA4zV+Uc2bq6ace2kyk8Jt5vOUU65O6Sw5bRd +52z1Ftfe89jQ== From: Sasha Levin To: stable@vger.kernel.org, alexander.deucher@amd.com Cc: Feifei Xu , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: FAILED: Patch "drm/amdgpu/gfx11: set UNORD_DISPATCH in compute MQDs" failed to apply to 5.10-stable tree Date: Wed, 27 Mar 2024 08:18:01 -0400 Message-ID: <20240327121801.2833996-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The patch below does not apply to the 5.10-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 . Thanks, Sasha Reviewed-by: Feifei Xu ------------------ original commit in Linus's tree ------------------ From fc8f5a29d4cf0979ac4019282c3ca5cb246969f9 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 19 Jan 2024 12:32:59 -0500 Subject: [PATCH] drm/amdgpu/gfx11: set UNORD_DISPATCH in compute MQDs This needs to be set to 1 to avoid a potential deadlock in the GC 10.x and newer. On GC 9.x and older, this needs to be set to 0. This can lead to hangs in some mixed graphics and compute workloads. Updated firmware is also required for AQL. Reviewed-by: Feifei Xu Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/a= mdgpu/gfx_v11_0.c index 043eff309100f..c1e0000107608 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c @@ -3846,7 +3846,7 @@ static int gfx_v11_0_compute_mqd_init(struct amdgpu_d= evice *adev, void *m, (order_base_2(prop->queue_size / 4) - 1)); tmp =3D REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, RPTR_BLOCK_SIZE, (order_base_2(AMDGPU_GPU_PAGE_SIZE / 4) - 1)); - tmp =3D REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, UNORD_DISPATCH, 0); + tmp =3D REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, UNORD_DISPATCH, 1); tmp =3D REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, TUNNEL_DISPATCH, prop->allow_tunneling); tmp =3D REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, PRIV_STATE, 1); diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c b/drivers/gpu= /drm/amd/amdkfd/kfd_mqd_manager_v11.c index 15277f1d5cf0a..d722cbd317834 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c @@ -224,6 +224,7 @@ static void update_mqd(struct mqd_manager *mm, void *mq= d, m->cp_hqd_pq_control =3D 5 << CP_HQD_PQ_CONTROL__RPTR_BLOCK_SIZE__SHIFT; m->cp_hqd_pq_control |=3D ffs(q->queue_size / sizeof(unsigned int)) - 1 - 1; + m->cp_hqd_pq_control |=3D CP_HQD_PQ_CONTROL__UNORD_DISPATCH_MASK; pr_debug("cp_hqd_pq_control 0x%x\n", m->cp_hqd_pq_control); =20 m->cp_hqd_pq_base_lo =3D lower_32_bits((uint64_t)q->queue_address >> 8); --=20 2.43.0