From patchwork Mon Dec 11 00:59:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13486545 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ACA26C4167B for ; Mon, 11 Dec 2023 00:59:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C7FF10E04E; Mon, 11 Dec 2023 00:59:58 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id B8B4610E04E for ; Mon, 11 Dec 2023 00:59:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1702256391; bh=shDzPGsI1oIYMZnAXANSyf2zj/GNqcqt9dxPVu+6vRk=; h=Date:From:To:Cc:Subject:From; b=Rgtw5RzQ0tWCPeWHxsPUDmYp32Ud4cAKry/Vtf2OGs6nZXlAKK2c2wJP33uPXy6fX J7rHzagQrQeMqQBSJEWHCvsLWg0Z6O0DHoxNXeyWUYCM5elY9YQBkr2o8WhEvvYJYT gp0XJEtu+92xdC8LMlihJKb4nszcMu7YRzyIuZEQ5ccICv09HcTgwRIz8x8DN/unCQ qv4aavLCjwycCn9ClVEjNkO38RNzQ9rsLjH2m/H69Nh6o56n6Qbc6O6ebnbO/bNeoA voovJTFsp4gjYsC4eeH4k8ifqoARojmorsYteauI9Y4oyTWUgIoXs6BBoyfUH0SyNf XuwtXh+87o6pQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SpNgp6ymYz4wdD; Mon, 11 Dec 2023 11:59:50 +1100 (AEDT) Date: Mon, 11 Dec 2023 11:59:50 +1100 From: Stephen Rothwell To: Rob Clark , Sean Paul , Dave Airlie Subject: linux-next: build failure after merge of the drm-msm tree Message-ID: <20231211115950.3918d572@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Deucher , Linux Next Mailing List , Linux Kernel Mailing List , DRI , Arunpravin Paneer Selvam Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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))