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: 176416 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6768080vqy; Sun, 10 Dec 2023 17:00:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IEoHyNFjxOTudzSKu9MJChV0awvyBXQUE4UbQSa8Rsb2Edc8x0SvIP0h+ScFhNA8CVRVLi7 X-Received: by 2002:a05:6a20:1609:b0:18f:97c:8a1e with SMTP id l9-20020a056a20160900b0018f097c8a1emr5051397pzj.73.1702256443096; Sun, 10 Dec 2023 17:00:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702256443; cv=none; d=google.com; s=arc-20160816; b=Lkd/Mj3MLoMHapyLjgfsuZKTCJpg6ubToiNV/7HFz43ZZoM+md7jlbse8uvJa+GLkx gKoD5M8Bjfvhgm6aW9wM8UoAMTIePSQ9dtYDMkfOYt3ErCIgPQSTbxXIvad+X9c82WPM STQ85/vtvEhkIr/2hz4KQbX3JAxQx1twxljabO1PsMzLYQfxLl9v7aPBprWg1UMTrcbV fd9sAN2oQ7l5i6uP7S3ZBz75n74ypcRilbfCa8kCmgp6Iv+UwNBOJeF901cK48oVb2Wx xftKwMWL6WP6tGPN0cmS8YpDXnplhSOE41dvXVvjqUDZ0Hlh7Q0ZEVae4MtatMS/v0T3 wmJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=shDzPGsI1oIYMZnAXANSyf2zj/GNqcqt9dxPVu+6vRk=; fh=e3+bIGsJwyCtjIjD7s7ttVv3Mx9RwW8esiO5AUGT+ww=; b=V+3TVJoOW1qUB8mItJNrHrf8qvMGzOSAUUeTBxUvv31hB+jSSH9yGPgXhsW2MJ52ZC PBCeMrHQPPGNTvxyG5RkbdGCP6gXx9dCIEPG1qWpKHbYNw/RnTsX2jE6gboJ8jH8kvjH 3t5q01Xfr5oSxEHZLKr6P9CXiXvyf4oYcwjGXkI9mhY+ABiFOy5raeZqFtJSy+CV+7wi nvsOgzMjPOv0LYzySn+JrflPX/4821gxM9eix2EO0CyOv2gcRFoOFisB/zZJ1JfW/FNz nYFKQK2+ibxlEk/ONJgfAYL+MseJmZOhH5T1qv18H0shm78YpP+/YZwpyvAwvs0HEGnM RBEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Rgtw5RzQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id kp12-20020a056a00464c00b006cbb6f87036si5259835pfb.97.2023.12.10.17.00.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 17:00:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Rgtw5RzQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 5F13D807B49E; Sun, 10 Dec 2023 17:00:19 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232256AbjLKA7v (ORCPT + 99 others); Sun, 10 Dec 2023 19:59:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232258AbjLKA7t (ORCPT ); Sun, 10 Dec 2023 19:59:49 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53BE4EB; Sun, 10 Dec 2023 16:59:53 -0800 (PST) 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 Cc: Alex Deucher , Arunpravin Paneer Selvam , DRI , Linux Kernel Mailing List , Linux Next Mailing List 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-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 10 Dec 2023 17:00:19 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784945251036179647 X-GMAIL-MSGID: 1784945251036179647 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))