Message ID | 20221116104752.4c64495a@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3001858wru; Tue, 15 Nov 2022 15:57:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf6/sUsAoJuZk/42mqmbmHgdFM0bapWlxtFTcBRZCUlzDJgTenSOjTWsNyQ/pUow0q5H/HnK X-Received: by 2002:a17:906:b2ca:b0:7ad:92c5:637a with SMTP id cf10-20020a170906b2ca00b007ad92c5637amr16052872ejb.87.1668556657988; Tue, 15 Nov 2022 15:57:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668556657; cv=none; d=google.com; s=arc-20160816; b=OsJHlJpIIKT/Q0dwgWNj/fuod6rMKkJpd75phDFjU60yCpw7q7A+W07nr/wxESKecL bSuOTPlz3l87KA9Aai0jGrIkWBcXiz9le/RbJ2q7Vdu1sj8J2tLkK+D2Xz0Zf0sd2CC7 MUmmHTrr3XXsOBN25m0sYnUbtO03Uuierl//6I9/wvHAH8V4kcUD4ec74kSntwR5TF7q ivqumhHLkmXCdMW8UWfwjZi04YRQTn+PzRkSQhFa+xE+kLsfnj6rcFMMVA4NVea0I21F rvi/YxDDw31SV0QNZ+sZXllmrgek++8zAfFN8KKruhcOy+pA893Vi2BypwS6RW1x1nnE KWSg== 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=mNBclmwaAQTxYMzZYFdEyX+gKdInfl7kuoGFMn09KBE=; b=gf6c0D9QuvEypKofLVKXPQvgysEIkuKysMwI+KryzQW7MqrKxbgxCRUg34w3pLSM8R s0LLuVLYKJCuo+/WZoBp+kEmyS2/zn7mcqUNtF0oxDWlwz3cenltwVuG5N2k42qxY2gD GJ9n3T1cIJ0Lka4fYs7hdLedqx0yosxe+ZVtHqPmYgdAofqWUFy1lzkMN/fkNWeCcZ02 Jh1RX5KHeZBLfLRKVyQHIPnyWsig2YQHjDnsu6eVJOMtiraymjbZZw9nZ93op7QyCor7 Q7oRYq/pMbh2Hk9n+pubJ70CmXZjfWCvV2m2+A6KEfqGc6bUX5YfqFK8V0RgcSK7STsL rS+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=VSBRMDX7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ne38-20020a1709077ba600b007877f3132d9si13127286ejc.438.2022.11.15.15.56.48; Tue, 15 Nov 2022 15:57:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=VSBRMDX7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231398AbiKOXsB (ORCPT <rfc822;maxim.cournoyer@gmail.com> + 99 others); Tue, 15 Nov 2022 18:48:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229575AbiKOXr6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 15 Nov 2022 18:47:58 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F807317F7; Tue, 15 Nov 2022 15:47:56 -0800 (PST) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NBjXn6LxNz4xTg; Wed, 16 Nov 2022 10:47:53 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668556074; bh=mNBclmwaAQTxYMzZYFdEyX+gKdInfl7kuoGFMn09KBE=; h=Date:From:To:Cc:Subject:From; b=VSBRMDX7d+o9U9vMdOkJFHDqhGZZpXmU1SF9zkKv+LvurcZNq+W66tBxTt9ArbT0p Puva/8Di6LF2Z1Q/TQb5Vzf90i1/4hFWHUotU+H8u5iyk/DbzxogZvIbzjcrCOqNZV fZdaZuguvV6MVMuqJG/CqR6dR+UyGPNxKJD8Il1th71kdbqwzf2F0NfvLwGtyTEz7z nGKpPzpV4A3GWAX5c/PTIrCISK4ki7IHi+AfYi4JxcoNxdDfzTZsSxd7DWiO7jaLTw JptBX61a7jj9+u4GEbZ+N+PK4xmNmhdv1R9LrYQe02zszVqfeS0q9kwScGoo5CiF+I QLGKVNzyAeFuQ== Date: Wed, 16 Nov 2022 10:47:52 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org> Cc: Christian =?utf-8?b?S8O2bmln?= <christian.koenig@amd.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree Message-ID: <20221116104752.4c64495a@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/wjgPxu/WZguAY0NUMy/Wf_I"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749608466335378863?= X-GMAIL-MSGID: =?utf-8?q?1749608466335378863?= |
Series |
linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree
|
|
Commit Message
Stephen Rothwell
Nov. 15, 2022, 11:47 p.m. UTC
Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c between commit: eca13f3c67b6 ("drm/amdgpu: use the last IB as gang leader v2") from the drm-misc-fixes tree and commit: 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
Comments
Hi all, On Wed, 16 Nov 2022 10:47:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > > between commit: > > eca13f3c67b6 ("drm/amdgpu: use the last IB as gang leader v2") > > from the drm-misc-fixes tree and commit: > > 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS") > > from the drm-misc tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > index de5cb056c9ad,0528c2b1db6e..000000000000 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > @@@ -1197,10 -1201,7 +1203,10 @@@ static int amdgpu_cs_sync_rings(struct > } > > for (i = 0; i < p->gang_size; ++i) { > + if (p->jobs[i] == leader) > + continue; > + > - r = amdgpu_sync_clone(&leader->sync, &p->jobs[i]->sync); > + r = amdgpu_sync_push_to_job(&p->sync, p->jobs[i]); > if (r) > return r; > } > @@@ -1241,14 -1243,11 +1247,14 @@@ static int amdgpu_cs_submit(struct amdg > for (i = 0; i < p->gang_size; ++i) > drm_sched_job_arm(&p->jobs[i]->base); > > - for (i = 0; i < (p->gang_size - 1); ++i) { > + for (i = 0; i < p->gang_size; ++i) { > struct dma_fence *fence; > > + if (p->jobs[i] == leader) > + continue; > + > fence = &p->jobs[i]->base.s_fence->scheduled; > - r = amdgpu_sync_fence(&leader->sync, fence); > + r = drm_sched_job_add_dependency(&leader->base, fence); > if (r) > goto error_cleanup; > } Note that I had to keep the declaration of "leader" in amdgpu_cs_sync_rings().
Am 16.11.22 um 01:25 schrieb Stephen Rothwell: > Hi all, > > On Wed, 16 Nov 2022 10:47:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: >> Today's linux-next merge of the drm-misc tree got a conflict in: >> >> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c >> >> between commit: >> >> eca13f3c67b6 ("drm/amdgpu: use the last IB as gang leader v2") >> >> from the drm-misc-fixes tree and commit: >> >> 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS") >> >> from the drm-misc tree. >> >> I fixed it up (see below) and can carry the fix as necessary. This >> is now fixed as far as linux-next is concerned, but any non trivial >> conflicts should be mentioned to your upstream maintainer when your tree >> is submitted for merging. You may also want to consider cooperating >> with the maintainer of the conflicting tree to minimise any particularly >> complex conflicts. >> >> -- >> Cheers, >> Stephen Rothwell >> >> diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c >> index de5cb056c9ad,0528c2b1db6e..000000000000 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c >> @@@ -1197,10 -1201,7 +1203,10 @@@ static int amdgpu_cs_sync_rings(struct >> } >> >> for (i = 0; i < p->gang_size; ++i) { >> + if (p->jobs[i] == leader) >> + continue; >> + >> - r = amdgpu_sync_clone(&leader->sync, &p->jobs[i]->sync); >> + r = amdgpu_sync_push_to_job(&p->sync, p->jobs[i]); >> if (r) >> return r; >> } >> @@@ -1241,14 -1243,11 +1247,14 @@@ static int amdgpu_cs_submit(struct amdg >> for (i = 0; i < p->gang_size; ++i) >> drm_sched_job_arm(&p->jobs[i]->base); >> >> - for (i = 0; i < (p->gang_size - 1); ++i) { >> + for (i = 0; i < p->gang_size; ++i) { >> struct dma_fence *fence; >> >> + if (p->jobs[i] == leader) >> + continue; >> + >> fence = &p->jobs[i]->base.s_fence->scheduled; >> - r = amdgpu_sync_fence(&leader->sync, fence); >> + r = drm_sched_job_add_dependency(&leader->base, fence); >> if (r) >> goto error_cleanup; >> } > Note that I had to keep the declaration of "leader" in amdgpu_cs_sync_rings(). This and all your other merge resolutions look good to me. And sorry for the noise, drm-tip somehow doesn't seem to work any more and we had a lot of conflicting patches going in through -fixes and -next. Regards, Christian. >
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index de5cb056c9ad,0528c2b1db6e..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c