Hi all, After merging the drm-msm tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c: In function 'amdgpu_seq64_map': drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c:64:9: error: too few arguments to function 'drm_exec_init' 64 | drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT); | ^~~~~~~~~~~~~ In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c:28: include/drm/drm_exec.h:138:6: note: declared here 138 | void drm_exec_init(struct drm_exec *exec, uint32_t flags, unsigned nr); | ^~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c: In function 'amdgpu_seq64_unmap': drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c:125:9: error: too few arguments to function 'drm_exec_init' 125 | drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT); | ^~~~~~~~~~~~~ include/drm/drm_exec.h:138:6: note: declared here 138 | void drm_exec_init(struct drm_exec *exec, uint32_t flags, unsigned nr); | ^~~~~~~~~~~~~ Caused by commit 05d249352f1a ("drm/exec: Pass in initial # of objects") interating with commit c8031019dc95 ("drm/amdgpu: Implement a new 64bit sequence memory driver") from the drm tree. I have applied this merge resolution patch for today; From: Stephen Rothwell Date: Mon, 11 Dec 2023 11:53:17 +1100 Subject: [PATCH] fix up for "drm/exec: Pass in initial # of objects" interacting with "drm/amdgpu: Implement a new 64bit sequence memory driver" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c index f3de02193138..7a6a67275404 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c @@ -61,7 +61,7 @@ int amdgpu_seq64_map(struct amdgpu_device *adev, struct amdgpu_vm *vm, if (!bo) return -EINVAL; - drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT); + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0); drm_exec_until_all_locked(&exec) { r = amdgpu_vm_lock_pd(vm, &exec, 0); if (likely(!r)) @@ -122,7 +122,7 @@ void amdgpu_seq64_unmap(struct amdgpu_device *adev, struct amdgpu_fpriv *fpriv) vm = &fpriv->vm; - drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT); + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0); drm_exec_until_all_locked(&exec) { r = amdgpu_vm_lock_pd(vm, &exec, 0); if (likely(!r)) -- 2.40.1 -- Cheers, Stephen Rothwell