[git pull] drm for 5.18-rc1

Linus Torvalds torvalds at linux-foundation.org
Thu Mar 24 23:30:44 UTC 2022


On Wed, Mar 23, 2022 at 7:30 PM Dave Airlie <airlied at gmail.com> wrote:
>
> This is the main drm pull request for 5.18.
>
> The summary changelog is below, lots of work all over,
> Intel improving DG2 support, amdkfd CRIU support, msm
> new hw support, and faster fbdev support.

Ok, so this was annoying.

I've merged it, but will note three things that I really hope get
fixed / checked:

 (1) My merge resolution looked mostly trivial, except for an annoying
conflict between commits

        4ed545e7d100 ("dt-bindings: display: mediatek: disp: split
each block to individual yaml")

and

        6d0990e6e844 ("media: dt-binding: mediatek: Get rid of
mediatek,larb for multimedia HW")

where one of them splits up a file that is modified by the other.

I ended up just getting rid of all the "mediatek,larb" mentions in the
split-up files, despite the fact that (a) those mentions can be found
elsewhere and (b) the split-up did other changes too, so maybe it's
wrong.

 (2) As Guenter reported, the fbdev performance improvement of
cfb_imageblit() is broken.

I was going to just revert it, but I see that there is a two-series
patch to fix it at

    https://lore.kernel.org/all/20220313192952.12058-1-tzimmermann@suse.de/

so I merged it in that broken form, in the hope that this set of fixes
will be sent to me asap.

 (3) Very similarly to (2), but broken mediatek DT files.

I hope my changes in (1) didn't make things worse, but there's a
series of fixes as

    https://lore.kernel.org/all/20220309134702.9942-1-jason-jh.lin@mediatek.com/

and again I hope I'll get those fixes from the proper places asap.

I considered just delaying merging this all entirely, but it seems
better to get this all in, with the known problems and known fixes,
and see if we hit something _else_ too.

Anyway, let's hope I didn't miss anything, and that those are the only
major issues.

                  Linus


More information about the dri-devel mailing list