On Mon, 8 Jun 2026, Christian König wrote:
On 6/8/26 14:23, Michał Grzelak wrote:
Checking `invalidated` field causes build to fail since it is absent in
struct amdgpu_vm. Replace it with &vm->individual.moved identically
as did commit 59720bfd8c6d ("drm/amdgpu: restart the CS if some parts of
the VM are still invalidated").
Cc: Vitaly Prosyak <[email protected]>
Cc: Christian König <[email protected]>
Cc: Alex Deucher <[email protected]>
Fixes: 40396ffdf612 ("drm/amdgpu: restart the CS if some parts of the VM are still
invalidated")
Signed-off-by: Michał Grzelak <[email protected]>
The field is renamed by a different patch so looks like a rebase/merge issue to
me, could be that the Fixes tag needs double checking.
My poor understanding is that commit 40396ffdf612 ("drm/amdgpu: restart
the CS if some parts of the VM are still invalidated") got introduced
into drm-tip after amd-drm-fixes-7.1-2026-06-04 got merged into drm-tip
at commit 2aaaf5931b16 ("Merge tag 'amd-drm-fixes-7.1-2026-06-04' of
https://gitlab.freedesktop.org/agd5f/linux into drm-fixes") which I
assume caused this build to fail. Meanwhile the commit should be a
backport of commit 59720bfd8c6d ("drm/amdgpu: restart the CS if some
parts of the VM are still invalidated") from amd-drm-next-7.2-2026-06-04
tag.
Thus I marked commit 40396ffdf612 ("drm/amdgpu: restart the CS if some
parts of the VM are still invalidated") in Fixes: tag from drm-tip
perspective, but I'm not sure if the description above applies nor have
clue how to properly tag it :(. Could you give any hints on which commit
should be actually put in Fixes:?
But either way Reviewed-by: Christian König <[email protected]>
Thank you Christian for the review. Assuming Fixes: is corrected, do you
think this could be applied via drm-misc/drm-misc-fixes? Asking since I
don't have commit right to any of drm-* repositories.
BR,
Michał
Thanks,
Christian.
---
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 548a4f14a9f8..5d8f5848bc0e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1323,7 +1323,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
e->range = NULL;
}
- if (r || !list_empty(&vm->invalidated)) {
+ if (r || !list_empty(&vm->individual.moved)) {
r = -EAGAIN;
mutex_unlock(&p->adev->notifier_lock);
return r;
