OSDN Git Service

Merge tag 'drm-misc-fixes-2022-01-14' of git://anongit.freedesktop.org/drm/drm-misc...
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 14 Jan 2022 14:15:56 +0000 (15:15 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 14 Jan 2022 14:17:17 +0000 (15:17 +0100)
commit71e4a7029045e3904e0e9242b4a7cd84d47b8fe5
tree2124889dfe07930943df0e156087566dd85a15e9
parentad783ff5a20f851c6d9bca03d12d44f98f494af7
parent016017a195b86d9761e91cb052438bf71207a12f
Merge tag 'drm-misc-fixes-2022-01-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Two DT bindings fixes for meson, a device refcounting fix for sun4i, a
probe fix for vga16fb, a locking fix for the CMA dma-buf heap and a
compilation fix for ttm.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
[danvet: I made sure I have exactly the same conflict resolution as
Linus in 8d0749b4f83b ("Merge tag 'drm-next-2022-01-07' of
git://anongit.freedesktop.org/drm/drm") to avoid further conflict fun.
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220114125454.zs46ny52lrxk3ljz@houat
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
drivers/gpu/drm/ast/ast_mode.c
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/nouveau/nouveau_fence.c
drivers/gpu/drm/tiny/simpledrm.c