Merge tag 'drm-next-5.5-2019-11-01' of git://people.freedesktop.org/~agd5f/linux...
authorDave Airlie <airlied@redhat.com>
Mon, 4 Nov 2019 00:22:53 +0000 (10:22 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 4 Nov 2019 00:22:53 +0000 (10:22 +1000)
commit8a86b00a437ec06b298477463c7a9b8774570507
tree82a09728da08ee4655721159f92054950dbb53e3
parent2ef4144d1ea8b181d377d0783c43032cb44889f7
parent5ab5e4e60accd13b0a505a4a34b6feafde2c8fbf
Merge tag 'drm-next-5.5-2019-11-01' of git://people.freedesktop.org/~agd5f/linux into drm-next

drm-next-5.5-2019-11-01:

amdgpu:
- Add EEPROM support for Arcturus
- Enable VCN encode support for Arcturus
- Misc PSP fixes
- Misc DC fixes
- swSMU cleanup

amdkfd:
- Misc cleanups
- Fix typo in cu bitmap parsing

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191101190607.3763-1-alexander.deucher@amd.com
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
drivers/gpu/drm/radeon/radeon_drv.c
drivers/gpu/drm/scheduler/sched_main.c