From: Dave Airlie <airlied@redhat.com>
Date: Wed, 13 Nov 2019 19:53:10 +0000 (+1000)
Subject: Merge v5.4-rc7 into drm-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=77e0723bd27f830d0903225372aa778fe2975648;p=linux.git

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>
---

77e0723bd27f830d0903225372aa778fe2975648
diff --cc drivers/gpu/drm/amd/display/dc/dcn21/Makefile
index 19fabac13c653,ff50ae71fe277..14113ccf498d2
--- a/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/v3d/v3d_gem.c
index 4c4b59ae2c810,19c092d75266b..549dde83408b0
--- a/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;
  		}