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;
Message-ID: <b40f9be2-e76d-5860-bf95-e02d0ce1ddee@amd.com>
Date:   Wed, 16 Nov 2022 13:13:09 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.2
Subject: Re: linux-next: manual merge of the drm-misc tree with the
 drm-misc-fixes tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20221116104752.4c64495a@canb.auug.org.au>
 <20221116112515.3f01531b@canb.auug.org.au>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
In-Reply-To: <20221116112515.3f01531b@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?L3U0czk3WmQySWFSa3pMMHlBWjJDMFBBeVdTWnJIUzM0Z05GdHlJbTZCOS9p?=
 =?utf-8?B?MlRvRzZnMXlCQ1l4L0tjTnhqQ2dyM0ZMMXQxNFVGK0VkZkc2cXV2K3htOFQ1?=
 =?utf-8?B?ZXRTZXE4c0Vjeng3V0NkNDF3UDVETVZCY1JEbkdRekowWXhuRFZ6STVseHZq?=
 =?utf-8?B?NmlIdU5TOFcyK3NPdlVhZnFzYXJVNmtDaVhWSUFxaTlDaktRR1E2ZnkwOWQw?=
 =?utf-8?B?V1BteGZ2MVBhTUFoZTFlUHgzU0dlL3JvNENGMmZyOWNkT2dzSVhrU012TVBt?=
 =?utf-8?B?YlYvYVZjSWRhMWRqQy9GYjFtNFdNMFh6bElRcGFqK3JSMWc0bjVOa0RFc1lo?=
 =?utf-8?B?NXRCVTVlc2NyYk1tKzRWU0pFbDNmOGNWZWRSdlpMS21yM21hSWlhY21vbmw3?=
 =?utf-8?B?WHR6ZzhLdlhXRFBkRXNEUUR3Vmgxb0J2MlpRbmdHZUhVekQ2REFCQ0svQ3pH?=
 =?utf-8?B?d2g0MWN0NzRMVkh2OUVySzhIejIvQ01GZEp0bGJ5TWF5dENLVGhBRml2eEZ4?=
 =?utf-8?B?NytDZkx0aGhIMHQ2cUt0NVBEbjhTWFJZY1pCMVhtcmhuSytwM0szWGNKeCtD?=
 =?utf-8?B?cTA1UWZuT0t2SEdBKzR5alBic3l3SXlWdG8vKzJEOTN6WVVUd25PNmlSNDhI?=
 =?utf-8?B?bzdrRlFHN0RUajl3blpqV0IrMFJwbzRITUVJY090ZTNhT25oWGhPODJXUjNW?=
 =?utf-8?B?ZHNQejNmUDVQTldLUzFPM2x0OHowb3A5dGk2T2VDRkZkT2xsK1NGUEtXd0p1?=
 =?utf-8?B?VzBqbXIvN1ZUWHIzMHhGL2l0S0t1ZmtYaE9ZNUxXVUxKMGxVSUlsamJVKzJD?=
 =?utf-8?B?aEZod0thWkU5Q3FsdkcvMjNQQUZmcXpPcWpPOEwrWEd4azV4VTB5Zy92eGs3?=
 =?utf-8?B?eXM2U29raVpSZllRd2x2TEs4K1cxWlJQd2JaQzZ0MkdmdElOZy80ajVWbzg3?=
 =?utf-8?B?bDhDMTIyTEpBclhMblpoc0syMHlxeWdscGIzVjU1UTVhNkE1ZnNVSnJkWnJy?=
 =?utf-8?B?MVRxSlVsZ3JCSFk3cTNubGpTOVFMcDBueHlUV3ROZEFYVGNldXB4RXEyOUpi?=
 =?utf-8?B?SjVFb2FJaE9SN1ZXNlIzanFOamxlR1AxZEdYN3NMOHoyakRtRkMvaFB3UFFM?=
 =?utf-8?B?eS9yaVM1T3hGMVpTRHJIVHlSU1crbkZ2WXJkb1lTdUpDSTdCRWRZTnFIajhs?=
 =?utf-8?B?L1drWVRCb091TEwwQ0V3bkI2NDNnUmsxZk8ra2VDWmtZZThTbExUcDEyMDEr?=
 =?utf-8?B?L1NUdExnTXNQeHp2RXRSNys5NVhiQzkvVkR0ZHdjN01jR1ZBMXFRaDcrT0Vy?=
 =?utf-8?B?WmVEZjFMZDF0eTFFeVgvVWZ0WDhSTXFkOGc3WkE5T0MzbnV5eVNDMXVJaHlQ?=
 =?utf-8?B?dU52L1MwUnFObzdiUkxBMnQwNk8xUmJRRHcrOWFrcFBkaXJTd1I4UkdCRWdI?=
 =?utf-8?B?bkhNMndnbGhXbkd6WTM3M2ZYVy9LMjNlMFBJSFBwZjlWOGpuY1dQNTBLR0Fk?=
 =?utf-8?B?dWY0YzZnRXhvQmhvN2c3ZFYyR3YrdTM0UXZhOUtVUjdJVDBLQ0lzeFJpeVZV?=
 =?utf-8?B?aVAyUmZNWDlTVHpIQ0ZZUGNhM1h2UW9CSU5qczhBNDJlQ2pJZDRJM01SblJB?=
 =?utf-8?B?ZmxIa0NBUmxkYzc1NWdhenVSNWlDUzlYZ1pOTFNBYUZ4dkJQVDZBcTYySmE4?=
 =?utf-8?B?QTRSZ2drMUsxcHhyYUFJVWoybTZ6V1V6dVVKam8yS20xS0pabnQ4UjhvV3JH?=
 =?utf-8?B?S2x0WXM5ejh5Uk5GOHpiUTBENnpOUnNpZXlaVkpRYmNKeVRQWnMxbXJDVnZD?=
 =?utf-8?B?TmoxbU5LcjJxWEt4TU9HOVZwRUZkMW45TUtPdnpZUWVMaEFnVkRQUFVhYnpE?=
 =?utf-8?B?MDYwd1piRmxZZytUZ3VzOFZxcXBGeWg1enowN1BRZ3N5QURwa0VDUjYzUXc5?=
 =?utf-8?B?dnZzZzh1ZXVuRzFWN3I3bmRDdWZWeVVjMzdiV2lZMU9PZGdpaUlMWS8rMjVK?=
 =?utf-8?B?QUZLSU92Skl6Qm40eGp1K0g3R3h0VTdLL09wVk51eHQ5ZlpHNnhKTFNRMDds?=
 =?utf-8?B?V3NSZUthaDJubWU1d3daUWNEUndyTDFmWWJUUHFweThjVCtkVnJ5RnlWMm5S?=
 =?utf-8?B?aEdlSFpoMWo1SUpNN3ErZXBiYmRJaFZMZENuZjJzREpnKys1N2lVMlloVFlE?=
 =?utf-8?Q?farlZeDQ7gECs1jgHqMbLwg3bt4ZHtwpgcMsaP0XJLhN?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c0aba084-0643-4308-c1e4-08dac7cbef74
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3587.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 12:13:13.8228
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Xhauxm0m/O1PWkiX3E8bC+aFJbRZSf1GnpmaVxdlzu9V4MZ5e+C7sX88v82P2Hxo
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6368
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,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


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.

>