AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Marek Olšák" <maraeo@gmail.com>
To: amd-gfx@lists.freedesktop.org
Cc: "Marek Olšák" <marek.olsak@amd.com>,
	"Christian König" <christian.koenig@amd.com>
Subject: [PATCH 04/13] drm/amdgpu/gfx12: remove GDS leftovers
Date: Wed, 26 Jun 2024 14:31:26 -0400	[thread overview]
Message-ID: <20240626183135.8606-4-marek.olsak@amd.com> (raw)
In-Reply-To: <20240626183135.8606-1-marek.olsak@amd.com>

GDS doesn't exist in gfx12. The incomplete packet allows userspace to hang
the hw from the kernel.

Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
index a638696b2142..ccb26f78252a 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
@@ -4108,21 +4108,6 @@ static void gfx_v12_0_ring_emit_ib_compute(struct amdgpu_ring *ring,
 		/* inherit vmid from mqd */
 		control |= 0x40000000;
 
-	/* Currently, there is a high possibility to get wave ID mismatch
-	 * between ME and GDS, leading to a hw deadlock, because ME generates
-	 * different wave IDs than the GDS expects. This situation happens
-	 * randomly when at least 5 compute pipes use GDS ordered append.
-	 * The wave IDs generated by ME are also wrong after suspend/resume.
-	 * Those are probably bugs somewhere else in the kernel driver.
-	 *
-	 * Writing GDS_COMPUTE_MAX_WAVE_ID resets wave ID counters in ME and
-	 * GDS to 0 for this ring (me/pipe).
-	 */
-	if (ib->flags & AMDGPU_IB_FLAG_RESET_GDS_MAX_WAVE_ID) {
-		amdgpu_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));
-		amdgpu_ring_write(ring, regGDS_COMPUTE_MAX_WAVE_ID);
-	}
-
 	amdgpu_ring_write(ring, PACKET3(PACKET3_INDIRECT_BUFFER, 2));
 	BUG_ON(ib->gpu_addr & 0x3); /* Dword align */
 	amdgpu_ring_write(ring,
@@ -4721,7 +4706,6 @@ static const struct amdgpu_ring_funcs gfx_v12_0_ring_funcs_gfx = {
 		SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 7 +
 		2 + /* VM_FLUSH */
 		8 + /* FENCE for VM_FLUSH */
-		20 + /* GDS switch */
 		5 + /* COND_EXEC */
 		7 + /* HDP_flush */
 		4 + /* VGT_flush */
-- 
2.34.1


  parent reply	other threads:[~2024-06-26 18:32 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-26 18:31 [PATCH 01/13] drm/amdgpu: check for LINEAR_ALIGNED correctly in check_tiling_flags_gfx6 Marek Olšák
2024-06-26 18:31 ` [PATCH 02/13] drm/amdgpu/gfx11: remove superfluous cache flags Marek Olšák
2024-06-26 18:31 ` [PATCH 03/13] drm/amdgpu/gfx12: " Marek Olšák
2024-06-26 18:31 ` Marek Olšák [this message]
2024-06-26 18:31 ` [PATCH 05/13] drm/amdgpu: remove AMD_FMT_MOD_GFX12_DCC_MAX_COMPRESSED_BLOCK_* definitions Marek Olšák
2024-06-26 20:21   ` Aurabindo Pillai
2024-06-26 18:31 ` [PATCH 06/13] drm/amdgpu/display: handle gfx12 in dm_check_cursor_fb Marek Olšák
2024-06-26 20:16   ` Aurabindo Pillai
2024-06-26 18:31 ` [PATCH 07/13] drm/amdgpu: add amdgpu_framebuffer::gfx12_dcc Marek Olšák
2024-06-26 20:51   ` Alex Deucher
2024-06-26 18:31 ` [PATCH 08/13] drm/amdgpu: don't use amdgpu_lookup_format_info on gfx12 Marek Olšák
2024-06-26 18:31 ` [PATCH 09/13] drm/amdgpu: handle gfx12 in amdgpu_display_verify_sizes Marek Olšák
2024-06-26 18:31 ` [PATCH 10/13] drm/amdgpu/display: handle gfx12 in amdgpu_dm_plane_format_mod_supported Marek Olšák
2024-06-26 20:16   ` Aurabindo Pillai
2024-06-26 18:31 ` [PATCH 11/13] drm/amdgpu/display: set plane attributes for gfx12 correctly Marek Olšák
2024-06-26 20:19   ` Aurabindo Pillai
2024-06-26 18:31 ` [PATCH 12/13] drm/amdgpu/display: add all gfx12 modifiers Marek Olšák
2024-06-26 20:20   ` Aurabindo Pillai
2024-06-26 18:31 ` [PATCH 13/13] drm/amdgpu: rewrite convert_tiling_flags_to_modifier_gfx12 Marek Olšák
2024-06-26 20:20   ` Aurabindo Pillai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240626183135.8606-4-marek.olsak@amd.com \
    --to=maraeo@gmail.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=christian.koenig@amd.com \
    --cc=marek.olsak@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox