Merge tag 'drm-next-5.6-2019-12-11' of git://people.freedesktop.org/~agd5f/linux...

drm-next-5.6-2019-12-11:

amdgpu:
- Add MST atomic routines
- Add support for DMCUB (new helper microengine for displays)
- Add OEM i2c support in DC
- Use vstartup for vblank events on DCN
- Simplify Kconfig for DC
- Renoir fixes for DC
- Clean up function pointers in DC
- Initial support for HDCP 2.x
- Misc code cleanups
- GFX10 fixes
- Rework JPEG engine handling for VCN
- Add clock and power gating support for JPEG
- BACO support for Arcturus
- Cleanup PSP ring handling
- Add framework for using BACO with runtime pm to save power
- Move core pci state handling out of the driver for pm ops
- Allow guest power control in 1 VF case with SR-IOV
- SR-IOV fixes
- RAS fixes
- Support for power metrics on renoir
- Golden settings updates for gfx10
- Enable gfxoff on supported navi10 skus
- Update MAINTAINERS

amdkfd:
- Clean up generational gfx code
- Fixes for gfx10
- DIQ fixes
- Share more code with amdgpu

radeon:
- PPC DMA fix
- Register checker fixes for r1xx/r2xx
- Misc cleanups

From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191211223020.7510-1-alexander.deucher@amd.com

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_chardev.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/calcs/Makefile
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dcn20/Makefile
index 10b4798,bb8a3b9..fd52862
--- 1/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
--- 2/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
@@@ -7,24 -7,17 +7,22 @@@ DCN20 = dcn20_resource.o dcn20_init.o d
                dcn20_stream_encoder.o dcn20_link_encoder.o dcn20_dccg.o \
                dcn20_vmid.o dcn20_dwb.o dcn20_dwb_scl.o
  
- ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
  DCN20 += dcn20_dsc.o
- endif
  
 -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/dcn20/dcn20_resource.o := -mhard-float -msse
  
 -CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mhard-float -msse $(cc_stack_align)
 +ifdef CONFIG_CC_IS_GCC
 +ifeq ($(call cc-ifversion, -lt, 0701, y), y)
 +IS_OLD_GCC = 1
 +endif
 +endif
  
 -ifdef CONFIG_CC_IS_CLANG
 +ifdef IS_OLD_GCC
 +# Stack alignment mismatch, proceed with caution.
 +# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3
 +# (8B stack alignment).
 +CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o += -mpreferred-stack-boundary=4
 +else
  CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o += -msse2
  endif
  

diff --cc drivers/gpu/drm/amd/display/dc/dcn21/Makefile
index 5b8c175,f8fb372..4763721
--- 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
@@@ -2,22 -2,18 +2,23 @@@
  #
  # Makefile for DCN21.
  
- DCN21 = dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o dcn21_hwseq.o dcn21_link_encoder.o
+ DCN21 = dcn21_init.o dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o \
+        dcn21_hwseq.o dcn21_link_encoder.o
  
 -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
  
 -CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mhard-float -msse $(cc_stack_align)
 +ifdef CONFIG_CC_IS_GCC
 +ifeq ($(call cc-ifversion, -lt, 0701, y), y)
 +IS_OLD_GCC = 1
 +endif
 +endif
  
 -ifdef CONFIG_CC_IS_CLANG
 +ifdef IS_OLD_GCC
 +# Stack alignment mismatch, proceed with caution.
 +# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3
 +# (8B stack alignment).
 +CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o += -mpreferred-stack-boundary=4
 +else
  CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o += -msse2
  endif
  

diff --cc drivers/gpu/drm/amd/display/dc/dml/Makefile
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_combios.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_display.c
Simple merge

diff --cc drivers/gpu/drm/radeon/si_dpm.c
Simple merge