From patchwork Mon Aug 19 01:56:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13767720 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 7E1D5C52D7C for ; Mon, 19 Aug 2024 01:57:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC76610E18E; Mon, 19 Aug 2024 01:57:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="eidlqQiD"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id F3C2610E18E for ; Mon, 19 Aug 2024 01:57:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1724032616; bh=Z9ua4HYe3l27bRihDl//IsW8kp5DNKDWbNNkXdoETLM=; h=Date:From:To:Cc:Subject:From; b=eidlqQiDy0N8xz8ZMdsnu9naWVy88+E7JY2AoYtXST/m6SbHWo7/IPR/4PzxOBG7v ZjxMa0ZP5sX3XbPyDuPVxmexvbWdcVE9oXIsr0A0zbNP5qC2uZFDJoWbK4HVUyiVAi 2UpDKslndhOemttxBUUAeANSBPzG7UzSJC9QUha8tc/TlIa4qXlx7y3AvxP/RPhp8R X0qrLQ5lRGVYLHVFpAVwYPXoTmL/a9QqbmpBTiRS0/IJaVpQQSM+9PpL9NOGzXTIOb sFZ565WxBD1CvmytXJESfBc6+gBmvnkl61PkTLPEPqZKRK+ti+7bSb4lHUbHIWndPS yhGN0Odrc+4+Q== 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) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4WnG1M2MMsz4wb0; Mon, 19 Aug 2024 11:56:55 +1000 (AEST) Date: Mon, 19 Aug 2024 11:56:54 +1000 From: Stephen Rothwell To: Alex Deucher , Dave Airlie Cc: Christian =?utf-8?b?S8O2bmln?= , DRI , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the amdgpu tree Message-ID: <20240819115654.77aeabcc@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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, After merging the amdgpu tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/amd/amdgpu/amdgpu_job.c: In function 'amdgpu_job_timedout': drivers/gpu/drm/amd/amdgpu/amdgpu_job.c:90:33: error: too many arguments to function 'drm_sched_start' 90 | drm_sched_start(&ring->sched, true); | ^~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h:28, from drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h:29, from drivers/gpu/drm/amd/amdgpu/amdgpu.h:43, from drivers/gpu/drm/amd/amdgpu/amdgpu_job.c:30: include/drm/gpu_scheduler.h:582:6: note: declared here 582 | void drm_sched_start(struct drm_gpu_scheduler *sched); | ^~~~~~~~~~~~~~~ Caused by commit 15789fa0f0e2 ("drm/amdgpu: add per ring reset support (v5)") interacting with commit 83b501c1799a ("drm/scheduler: remove full_recover from drm_sched_start") from the drm tree. I have applied the following merge fix patch. From: Stephen Rothwell Date: Mon, 19 Aug 2024 11:46:24 +1000 Subject: [PATCH] fixup for "drm/amdgpu: add per ring reset support (v5)" interacting with "drm/scheduler: remove full_recover from drm_sched_start" from the drm tree. Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index c6a1783fc9ef..597489dea114 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -87,7 +87,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) atomic_inc(&ring->adev->gpu_reset_counter); amdgpu_fence_driver_force_completion(ring); if (amdgpu_ring_sched_ready(ring)) - drm_sched_start(&ring->sched, true); + drm_sched_start(&ring->sched); goto exit; } }