Daniel Vetter a6b8720c2f Merge tag 'amd-drm-next-5.12-2021-01-20' of https://gitlab.freedesktop.org/agd5f/linux into drm-next ... amd-drm-next-5.12-2021-01-20: amdgpu: - Fix non-x86 build - W=1 fixes from Lee Jones - Enable GPU reset on Navy Flounder - Kernel doc fixes - SMU workload profile fixes for APUs - Display updates - SR-IOV fixes - Vangogh SMU feature enablment and bug fixes - GPU reset support for Vangogh - Misc cleanups Conflicts: drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c Resolve the conflict by picking the initialization value from amd from f03e80d2e8 ("drm/amd/display: Initialize stack variable") over the one Linus picked in 61d791365b ("drm/amd/display: avoid uninitialized variable warning"). It shouldn't matter. From: Alex Deucher <alexdeucher@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210120060951.22600-1-alexander.deucher@amd.com Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2021-01-20 13:08:18 +01:00
..
drm	Merge tag 'amd-drm-next-5.12-2021-01-20' of https://gitlab.freedesktop.org/agd5f/linux into drm-next	2021-01-20 13:08:18 +01:00
host1x	gpu/host1x: bus: Add missing description for 'driver'	2020-11-05 22:12:55 +01:00
ipu-v3	gpu/ipu-v3/ipu-di: Strip out 2 unused 'di_sync_config' entries	2021-01-04 12:54:18 +01:00
trace
vga	pci-v5.11-changes	2020-12-15 16:49:59 -08:00
Makefile