On Tue, 28 Feb 2023, Andi Shyti <andi.shyti@xxxxxxxxxxxxxxx> wrote:
> Hi Dmitry,
>
> On Tue, Feb 28, 2023 at 04:15:28PM +0300, Dmitry Osipenko wrote:
>> Hi,
>>
>> On 2/28/23 15:50, Andi Shyti wrote:
>> > Commit 67b7836d4458 ("drm/shmem-helper: Switch to reservation
>> > lock") removes the drm_gem_shmem_get_pages_locked() and
>> > drm_gem_shmem_put_pages_locked().
>> >
>> > But then commit ddddedaa0db9 ("drm/shmem-helper: Fix locking for
>> > drm_gem_shmem_get_pages_sgt()") reintroduces it.
>> >
>> > Somehow these two commits got mixed up and produce the following
>> > compile error:
>>
>> The 67b7836d4458 goes after ddddedaa0db9 in misc-next. It was a bad
>> merge conflict resolution in drm-tip that was fixed yesterday, there is
>> no problem in misc-next. Where do you see this error?
>
> yes, indeed! I was indeed surprised to see this mismatch.
>
> I see it in the Intel's drm-tip branch[*]
To set the record straight, drm-tip isn't Intel's, it's an integration
branch shared by the drm community.
Looks like the same bad merge resolution has resurrected itself somehow,
maybe Thomas'
commit 418ce969b4c8533c7c76cc0b7adeb432ccdc137e
Author: Thomas Zimmermann <tzimmermann@xxxxxxx>
Date: Tue Feb 28 10:03:24 2023 +0100
2023y-02m-28d-09h-02m-44s UTC: drm-tip rerere cache update
git version 2.39.2
in drm-rerere brought it back.
And the build is indeed currently broken.
Moreover, when the build was fine for a while, apparently the changes in
shmem broke a bunch of machines in Intel CI. And due to this, we aren't
getting any CI results for incoming patches right now.
BR,
Jani.
>
> Cc'ing the Intel's mailing list and maintainers, as well.
>
> Tnanks,
> Andi
>
> [*] git.freedesktop.org/git/drm-tip
--
Jani Nikula, Intel Open Source Graphics Center
