Merge v5.4-rc7 into drm-next

We have the i915 security fixes to backmerge, but first
let's clear the decks for other drivers to avoid a bigger
mess.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --cc MAINTAINERS
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dcn21/Makefile
index 19fabac13c65311b15c571d56a5e434a54cd11f8,ff50ae71fe277b0052440a9a67d175c3c2293b6a..14113ccf498d27c6d9eb48790cc83821fabb989e
--- 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,17 -1,22 +1,22 @@@
  #
  # 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
  
- 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/powerplay/navi10_ppt.c
Simple merge

diff --cc drivers/gpu/drm/amd/powerplay/vega20_ppt.c
Simple merge

diff --cc drivers/gpu/drm/arm/display/komeda/komeda_kms.c
Simple merge

diff --cc drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
Simple merge

diff --cc drivers/gpu/drm/drm_atomic_helper.c
Simple merge

diff --cc drivers/gpu/drm/panfrost/panfrost_drv.c
Simple merge

diff --cc drivers/gpu/drm/v3d/v3d_gem.c
index 4c4b59ae2c81067dd39b5113a8edea29dff3a40f,19c092d75266b451c05f5e095ef6b8150782a68a..549dde83408b0ffed1b0204702978b351e17917a
--- 1/drivers/gpu/drm/v3d/v3d_gem.c
--- 2/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@@ -566,8 -565,8 +568,9 @@@ v3d_submit_cl_ioctl(struct drm_device *
                ret = v3d_job_init(v3d, file_priv, &bin->base,
                                   v3d_job_free, args->in_sync_bcl);
                if (ret) {
 +                      kfree(bin);
                        v3d_job_put(&render->base);
+                       kfree(bin);
                        return ret;
                }
  

diff --cc include/drm/drm_gem_shmem_helper.h
Simple merge