aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2025-04-24 16:46:55 -0400
committerAlex Deucher <alexander.deucher@amd.com>2025-04-30 18:16:07 -0400
commit2408b0272b042e751b6a3cbbc14bb638bccfcefc (patch)
tree16e773f23c0b54b54d4489c5da4a617ab8e325cd /drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
parentdrm/amdgpu/mes: remove more unused functions (diff)
downloadlinux-2408b0272b042e751b6a3cbbc14bb638bccfcefc.tar.gz
linux-2408b0272b042e751b6a3cbbc14bb638bccfcefc.zip
drm/amdgpu/mes: consolidate on a single mes reset callback
Use the legacy one as it covers both kernel queues and user queues. Reviewed-by: Sunil Khatri <sunil.khatri@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
index 2103c8dcd7f3..5de0d6c528f4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
@@ -335,7 +335,7 @@ int amdgpu_mes_reset_legacy_queue(struct amdgpu_device *adev,
unsigned int vmid,
bool use_mmio)
{
- struct mes_reset_legacy_queue_input queue_input;
+ struct mes_reset_queue_input queue_input;
int r;
memset(&queue_input, 0, sizeof(queue_input));
@@ -349,8 +349,10 @@ int amdgpu_mes_reset_legacy_queue(struct amdgpu_device *adev,
queue_input.wptr_addr = ring->wptr_gpu_addr;
queue_input.vmid = vmid;
queue_input.use_mmio = use_mmio;
+ if (ring->funcs->type == AMDGPU_RING_TYPE_GFX)
+ queue_input.legacy_gfx = true;
- r = adev->mes.funcs->reset_legacy_queue(&adev->mes, &queue_input);
+ r = adev->mes.funcs->reset_hw_queue(&adev->mes, &queue_input);
if (r)
DRM_ERROR("failed to reset legacy queue\n");
it/gitweb/gitweb.perl?h=main&id=fb3bb3d1325f1d0a8cdc402a596c9a520b0ccbe6&follow=1'>gitweb: Fix export check in git_get_projects_listDevin Doucette1-2/+3 2008-12-27Start 1.6.2 cycleJunio C Hamano2-1/+29 2008-12-27git-send-email.txt: move --format-patch paragraph to a proper locationAdeodato Simó1-6/+6 2008-12-27git-shortlog.txt: improve documentation about .mailmap filesAdeodato Simó1-7/+33 2008-12-27pretty: support multiline subjects with format:René Scharfe1-19/+34 2008-12-27pretty: factor out format_subject()René Scharfe1-18/+24 2008-12-27pretty: factor out skip_empty_lines()René Scharfe1-9/+15 2008-12-26merge-file: handle freopen() failureRené Scharfe1-2/+5 2008-12-26daemon: cleanup: factor out xstrdup_tolower()René Scharfe1-21/+13 2008-12-26daemon: cleanup: replace loop with ifRené Scharfe1-13/+5 2008-12-26daemon: handle freopen() failureRené Scharfe1-1/+3 2008-12-26describe: Avoid unnecessary warning when using --allShawn O. Pearce2-1/+7 2008-12-24GIT 1.6.1v1.6.1Junio C Hamano2-0/+9 2008-12-24rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin2-3/+13 2008-12-22t9129: skip the last three tests if UTF-8 locale is not availableMiklos Vajna1-13/+17 2008-12-21GIT 1.6.1-rc4v1.6.1-rc4Junio C Hamano1-1/+18 2008-12-21Always show which directory is not a git repositoryRichard Hartmann3-4/+4 2008-12-21Make help entries alphabeticalRichard Hartmann1-4/+4 2008-12-21git-revert documentation: refer to new HOWTO on reverting faulty mergesBoyd Stephen Smith Jr1-0/+8 2008-12-21git-revert: record the parent against which a revert was madeRobin Rosenberg1-0/+5 2008-12-22gitk: Force the focus to the main window on WindowsJohannes Sixt1-0/+5 2008-12-22gitk: Allow unbalanced quotes/braces in commit headersKevin Ballard1-2/+3 2008-12-22gitk: Update German translationChristian Stimming1-29/+157 2008-12-22gitk: Mark forgotten strings (header sentence parts in color chooser) for tra...Christian Stimming1-6/+6 2008-12-22gitk: Ensure that "Reset branch" menu entry is enabledJohannes Sixt1-1/+1 2008-12-22gitk: Use check-buttons' -text property instead of separate labelsJohannes Sixt1-20/+10 2008-12-22gitk: Map / to focus the search boxGiuseppe Bilotta1-2/+2 2008-12-21doc/git-fsck: change the way for getting heads' SHA1sMarkus Heidelberg1-1/+2 2008-12-21Documentation/git-show-branch: work around "single quote" typesetting glitchMarkus Heidelberg1-1/+1 2008-12-21send-email: futureproof split_addrs() subJunio C Hamano1-1/+1 2008-12-21Make sure lockfiles are unlocked when dying on SIGPIPEJunio C Hamano2-0/+18 2008-12-21fast-import.c: stricter strtoul check, silence compiler warningRené Scharfe1-4/+7 2008-12-21connect.c: stricter port validation, silence compiler warningRené Scharfe1-2/+2