From nobody Sat Sep 13 22:33:33 2025 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F815182B3; Mon, 19 Aug 2024 01:56:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724032624; cv=none; b=WlNFKzlaemfxLj2Pua+gpITU3shLnw8l7aZ6nZmxO64uidTM9k0my+a2k4OBaav+H058EtlF5tPVatRsjQGios4EPzGTV5lRGBUPvn26bIJSIgXBbyI+Jn0GXwSEacw2B6Ka0JLDGhUJIu0K5p7TC4M1cEWTAEzaZ5F+laAihaY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724032624; c=relaxed/simple; bh=Gy1/T7jrcxQ8pmjT5ZNpftxLkOgjONj4piSfHaFfBiI=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=d82fHdQ6ulgrZTyLBZ6HradMllOx3J/7hw6IKshBsGPNZBvOAFrnJ+Y6wrHwHbwtLYQ++nJom14Jg5J9+/bV84y7y3O2oJYifmLKt1L/Ju+BIJ41OhZtoktFKVr0ulQcxWj/Ln7FFeVbkV8Tmt7fESQXF6CA12uDnFgQ0X3k9ck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=eidlqQiD; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="eidlqQiD" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/t_c0q45LlXL1EPMNS1P.A24"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/t_c0q45LlXL1EPMNS1P.A24 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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; } } --=20 2.43.0 --=20 Cheers, Stephen Rothwell --Sig_/t_c0q45LlXL1EPMNS1P.A24 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmbCpmYACgkQAVBC80lX 0GxPqQf/cMKY1d8GDXBEnR3Uqre4pyfcrR1gNfkAA88HldPdvHn2fgvNQ4TfTL3/ CLuQzPDFdcvAerPtJs54epGSbEZHGNFCw1evq5rMtxBgcth/rCMxXhrqo8nue1Gv SauDUJqFKt7fsw9sXHXOBekxhWds34BuaEO5D+9379Io2+6PT17deRY0fmOrRrmf O9Pkch3+MeZnCySTRrcJ6uL6TaXmSdX6fa0eR1ufwK4e73OVCmpclxr6JEGDQS70 JA/TByNqYAqaWtOI0BjvjDb9foimXuaLB9h6wSDuMERJ+O6/y1N1qmQqQ4MVgGFU QpIsI+JPYRO9300PAQlSZg6+W9AHJA== =0kIr -----END PGP SIGNATURE----- --Sig_/t_c0q45LlXL1EPMNS1P.A24--