Merge tag 'drm-next-5.5-2019-10-25' of git://people.freedesktop.org/~agd5f/linux...

drm-next-5.5-2019-10-25:

amdgpu:
- BACO support for CI and VI asics
- Quick memory training support for navi
- MSI-X support
- RAS fixes
- Display AVI infoframe fixes
- Display ref clock fixes for renoir
- Fix number of audio endpoints in renoir
- Fix for discovery tables
- Powerplay fixes
- Documentation fixes
- Misc cleanups

radeon:
- revert a PPC fix which broke x86

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191025221020.203546-1-alexander.deucher@amd.com

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dcn21/Makefile
index ef673bf,b7a9285..19fabac
--- 1/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
--- 2/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
@@@ -1,19 -1,9 +1,19 @@@
  #
  # Makefile for DCN21.
  
- DCN21 = dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o
+ DCN21 = dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o dcn21_hwseq.o dcn21_link_encoder.o
  
 -CFLAGS_dcn21_resource.o := -mhard-float -msse -mpreferred-stack-boundary=4
 +ifneq ($(call cc-option, -mpreferred-stack-boundary=4),)
 +      cc_stack_align := -mpreferred-stack-boundary=4
 +else ifneq ($(call cc-option, -mstack-alignment=16),)
 +      cc_stack_align := -mstack-alignment=16
 +endif
 +
 +CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mhard-float -msse $(cc_stack_align)
 +
 +ifdef CONFIG_CC_IS_CLANG
 +CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o += -msse2
 +endif
  
  AMD_DAL_DCN21 = $(addprefix $(AMDDALPATH)/dc/dcn21/,$(DCN21))
  

diff --cc drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
Simple merge