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: <4b1f104f-3b2a-532d-3354-11c68c5b9aa6@amd.com>
Date:   Wed, 14 Dec 2022 09:05:06 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.2
Subject: Re: [git pull] drm for 6.2-rc1
Content-Language: en-US
To:     Linus Torvalds <torvalds@linux-foundation.org>,
        Dave Airlie <airlied@gmail.com>,
        Alex Deucher <alexander.deucher@amd.com>
Cc:     Daniel Vetter <daniel.vetter@ffwll.ch>,
        dri-devel <dri-devel@lists.freedesktop.org>,
        LKML <linux-kernel@vger.kernel.org>
References: <CAPM=9txGCMqyriq_xiwgFCUBa-PpHvSuRQuptAHusHcjpH+zqA@mail.gmail.com>
 <CAHk-=whVsxgtwvnK2=WRvs_i+miknfB2R7dQ4U8oooBFJZYH6w@mail.gmail.com>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
In-Reply-To: <CAHk-=whVsxgtwvnK2=WRvs_i+miknfB2R7dQ4U8oooBFJZYH6w@mail.gmail.com>
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?RllwanFpMkpaMFl2eDk4T3Z1M3VIYVZyNWhlOEZrRVhQbHpINXU5N3FMT2E1?=
 =?utf-8?B?NlJZMTRYT3MyQkIwMllseWVST05yL3NBZzlyZC9Lb1E2a1JUMW5IUTg1V25z?=
 =?utf-8?B?N1orblliSyt1OFNpcUcydVB1VXdJREdNdG42bzQ4eFVNTFE3a2E0UFhPRngw?=
 =?utf-8?B?UXBZWlB5VktkSlprV2U1dDFxSzkwTEVYZjZTZEEyTWRZampQU3FHMEF1SVNZ?=
 =?utf-8?B?Yi8xSXR0U2dTcjhlVml3M3ZXdndMdzUveFFWNm9xeWoxNzU3YzJ1d1RlVWNC?=
 =?utf-8?B?NS8rT1ZSRzZYM2JCdXdwemVBT3RMYmpLbFNMY1ZvRWFpYzdGQWh6ci9XeE96?=
 =?utf-8?B?dEp2bEFRV090SXkzTlc2L25rakNzWHpESFFpMTQ0Mlh0MXorTU4zWkpnNUVV?=
 =?utf-8?B?eXgrOTVmTU44dGhwNkYrM3Yya0JWUnBlVEE3bTBUTGRhWFNaMTRaNTZPeDFL?=
 =?utf-8?B?blNrQUlyQ3MyRndkWEhIYUZ5bEpSZ295eVJUdFJZZi92K2NCekdqcHVaTHJH?=
 =?utf-8?B?bzdIa3pjMDdISGZ1b3dKZzZvRTZxK3VwYWd2eHViYitHOFo2OVp2d1ZjWHZK?=
 =?utf-8?B?VzBNQWk5RTRvWTlGU1N2aU9uVWNsWmQ3b3hpTkRaOXg2RS96UWJpZmdFYXR5?=
 =?utf-8?B?TlFLUTJuSDJLRC9tQkFzaXN1NkpYQ01OMU5GcitQa0tsNEdWOEFtaWpJN1pa?=
 =?utf-8?B?OTN5SVhKY2pBaHN2RGV6L293eTBJNlN0ci9xQUNXWTlzN2lqQndFS2dxYUgr?=
 =?utf-8?B?ZE9Yam1uTEQ3MGhvdjZsQVArb21NWGVMZXZVZG9aNmlHeUZLNTFiLzNDdk5U?=
 =?utf-8?B?NW02cTU2M0pIN1N4TFhqM0E0OVU1aFNDZURJTERBVElEK2ZjVE5FT0w1aWMz?=
 =?utf-8?B?LzFrb2ZjUUhqVnFCZW9DeUJRZklzdFI5STNhNWNWbGduNnZhUUJ4ejJ1SWcw?=
 =?utf-8?B?U3AwWDMycndKVWY0QzY5THI3bmV3Ylh1bWtYNzFwUzhEQ3ZOR2tEM1UzZlY5?=
 =?utf-8?B?N050K3ZqcTJTa3luK2NaZEFzSXE3UzlucG1XOGNlOGtEcEordWVVSXJYcVNY?=
 =?utf-8?B?SUJrTC9IRkFrUjAxM01vRU1kNzBOSWN3a25qQkVjWHZISGNkcEJOU2JLSkox?=
 =?utf-8?B?dzBicHk0djk2V2ZtRHF5R1hHWW9KSEh3UnRVL2JhKzh5MTA0YktMMXU2aHlL?=
 =?utf-8?B?NzBYc0ZWWGpGMUFYeUhqMjJJS0s4dGtXVFlrQWoxVHNLdmJVZVNkY1FMYnB5?=
 =?utf-8?B?T3VOWGNJMWlqNkdBTzhvandOK0JNT1NWVFNzRmJBTEt1V0ZUWlZZRjBkdXJ2?=
 =?utf-8?B?S2RoeTVYaCtjckQ5azB2QXdsYzBrdzdiZUZBS3pqVzhzWlZxSXNzL3BUbE91?=
 =?utf-8?B?MUVVMk53Y0hTZnZjdjRHQVpIQ1M0SytuQVhtdjI1M0dkWElGdytwcHFKQ2Zi?=
 =?utf-8?B?SW5YNU5RQVpiUnZqVjFhNEhuWTZUT2JnNU5tbkxNYnMxU3dkdFRWazJaUXJs?=
 =?utf-8?B?WTQxR3dXOGs0dWdaZFFZbWg3aElhUXlUWXJGOXgwTDBuZ2tNNzlaQVdvZ0FR?=
 =?utf-8?B?VmlsNTl6T2NhVDJOdGxORWh5MkRzL0tXZnZyWUMyRHZaU2tRejhQM1NqTEQr?=
 =?utf-8?B?bTZINTdMRm1RSGo3ZnR1M1hiSyt2cmcrU0xLNGpkMGlUUVZQSUJFT205NE4r?=
 =?utf-8?B?TS9QWTNYRVBzK2NndnV4bkRTREdidndvUkR5NjZIUjlMVnFwWVkvTTFSR1Rm?=
 =?utf-8?B?dUFPbVo4SlVYUE9BbGVaRVkxaENLVndwWDFLMWNCUURtbVJNRDllUGlBUllO?=
 =?utf-8?B?TFpNSWw3dTdHb0RMRGQxYjlkdjRLN3VQNmNZNTBEb3dFVDFHTTZqbFRFRUcr?=
 =?utf-8?B?YTQ0T1ByRUZyRjg1NDhwSTh1Z0dYd1BiVC9DYTJqN0x0U3l6azlNMmZyaWlu?=
 =?utf-8?B?eUVOM3UzVDMzRE1NQmIyemt2V3MvQ1VVOGNHcjJ6amhBY09TMU9McEszSDZ3?=
 =?utf-8?B?WW14MXppUEczNlN1Q1ZVWGt5M29RdWRHdFRTdVZhcjlLTWZ5QXdmeit5QkdL?=
 =?utf-8?B?TTFpTGxXTldOZXFOR083a0g2THBJanZvcUROM21uSTZMNmxjcmlUWDgyRUhD?=
 =?utf-8?B?UU01UHNOS2lMOFJpUzRLeEJlWlNldkN3MnIzY0JhUDB3WUJ4bjVpNEhVMnpn?=
 =?utf-8?Q?V8hfVlG7P5HGnqPfDKOr8A2mOfzDB2DbFRm6Vn7q8Rxl?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 500c3e7a-8b8f-47ec-1c60-08dadda9ec88
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3587.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 08:05:11.5932
 (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: 8NZbGfAmTtfPxvdWCwB+isGqNbosTfw25Po6DYz6TxOMqJuv5vwIZTiTYLNQQ5S8
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7911
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,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,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 13.12.22 um 21:14 schrieb Linus Torvalds:
> On Mon, Dec 12, 2022 at 6:56 PM Dave Airlie <airlied@gmail.com> wrote:
>> There are a bunch of conflicts, one in amdgpu is a bit nasty, I've
>> cc'ed Christian/Alex to make sure they know to check whatever
>> resolution you find. The one I have is what we have in drm-tip tree.
> Hmm. My merge resolution is slightly different from yours.
>
> You seem to have basically dropped commit b09d6acba1d9 ("drm/amdgpu:
> handle gang submit before VMID").
>
> Now, there are other fence changes in the drm tree that may mean that
> that commit *should* be dropped, so it's entirely possible that my
> resolution which kept that ordering change might be wrong and your
> resolution that just took the drm tip code is the right one.
>
> Christian? Alex? Can you please double-check what I just pushed out?

Yeah, that's certainly not correct. The ordering problem b09d6acba1d9 
fixed is back there again.

I'm like 99% sure that I did the right thing and my local drm-tip 
certainly at some point had the right conflict resolution because I've 
used that for testing the change.

The last 1% is that it's possible that I only fixed this on the build 
server and never pushed into the upstream repository.

Anyway we need to re-apply b09d6acba1d9 which should be trivial.

Thanks,
Christian.

>
>              Linus