diff options
| author | Daniel Vetter <[email protected]> | 2022-01-14 14:15:56 +0000 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2022-01-14 14:17:17 +0000 |
| commit | 71e4a7029045e3904e0e9242b4a7cd84d47b8fe5 (patch) | |
| tree | 2124889dfe07930943df0e156087566dd85a15e9 /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
| parent | Merge tag 'drm-misc-next-fixes-2022-01-13' of git://anongit.freedesktop.org/d... (diff) | |
| parent | drm/ttm: fix compilation on ARCH=um (diff) | |
| download | kernel-71e4a7029045e3904e0e9242b4a7cd84d47b8fe5.tar.gz kernel-71e4a7029045e3904e0e9242b4a7cd84d47b8fe5.zip | |
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 <[email protected]>
[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 <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20220114125454.zs46ny52lrxk3ljz@houat
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c')
0 files changed, 0 insertions, 0 deletions
