git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 0f0727d971f6fdf8f1077180d495ddb9928f0c8b Mon Sep 17 00:00:00 2001
   2 From: Nick Desaulniers <ndesaulniers@google.com>
   3 Date: Mon, 22 Jul 2019 15:31:05 -0700
   4 Subject: drm/amd/display: readd -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines
   5
   6 From: Nick Desaulniers <ndesaulniers@google.com>
   7
   8 commit 0f0727d971f6fdf8f1077180d495ddb9928f0c8b upstream.
   9
  10 arch/x86/Makefile disables SSE and SSE2 for the whole kernel.  The
  11 AMDGPU drivers modified in this patch re-enable SSE but not SSE2.  Turn
  12 on SSE2 to support emitting double precision floating point instructions
  13 rather than calls to non-existent (usually available from gcc_s or
  14 compiler_rt) floating point helper routines for Clang.
  15
  16 This was originally landed in:
  17 commit 10117450735c ("drm/amd/display: add -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines")
  18 but reverted in:
  19 commit 193392ed9f69 ("Revert "drm/amd/display: add -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines"")
  20 due to bugreports from GCC builds. Add guards to only do so for Clang.
  21
  22 Link: https://bugs.freedesktop.org/show_bug.cgi?id=109487
  23 Link: https://github.com/ClangBuiltLinux/linux/issues/327
  24
  25 Suggested-by: Sedat Dilek <sedat.dilek@gmail.com>
  26 Suggested-by: Sami Tolvanen <samitolvanen@google.com>
  27 Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
  28 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  29 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  30
  31 ---
  32  drivers/gpu/drm/amd/display/dc/calcs/Makefile |    4 ++++
  33  drivers/gpu/drm/amd/display/dc/dcn20/Makefile |    4 ++++
  34  drivers/gpu/drm/amd/display/dc/dml/Makefile   |    4 ++++
  35  drivers/gpu/drm/amd/display/dc/dsc/Makefile   |    4 ++++
  36  4 files changed, 16 insertions(+)
  37
  38 --- a/drivers/gpu/drm/amd/display/dc/calcs/Makefile
  39 +++ b/drivers/gpu/drm/amd/display/dc/calcs/Makefile
  40 @@ -32,6 +32,10 @@ endif
  41
  42  calcs_ccflags := -mhard-float -msse $(cc_stack_align)
  43
  44 +ifdef CONFIG_CC_IS_CLANG
  45 +calcs_ccflags += -msse2
  46 +endif
  47 +
  48  CFLAGS_dcn_calcs.o := $(calcs_ccflags)
  49  CFLAGS_dcn_calc_auto.o := $(calcs_ccflags)
  50  CFLAGS_dcn_calc_math.o := $(calcs_ccflags) -Wno-tautological-compare
  51 --- a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
  52 +++ b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
  53 @@ -18,6 +18,10 @@ endif
  54
  55  CFLAGS_dcn20_resource.o := -mhard-float -msse $(cc_stack_align)
  56
  57 +ifdef CONFIG_CC_IS_CLANG
  58 +CFLAGS_dcn20_resource.o += -msse2
  59 +endif
  60 +
  61  AMD_DAL_DCN20 = $(addprefix $(AMDDALPATH)/dc/dcn20/,$(DCN20))
  62
  63  AMD_DISPLAY_FILES += $(AMD_DAL_DCN20)
  64 --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile
  65 +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile
  66 @@ -32,6 +32,10 @@ endif
  67
  68  dml_ccflags := -mhard-float -msse $(cc_stack_align)
  69
  70 +ifdef CONFIG_CC_IS_CLANG
  71 +dml_ccflags += -msse2
  72 +endif
  73 +
  74  CFLAGS_display_mode_lib.o := $(dml_ccflags)
  75
  76  ifdef CONFIG_DRM_AMD_DC_DCN2_0
  77 --- a/drivers/gpu/drm/amd/display/dc/dsc/Makefile
  78 +++ b/drivers/gpu/drm/amd/display/dc/dsc/Makefile
  79 @@ -9,6 +9,10 @@ endif
  80
  81  dsc_ccflags := -mhard-float -msse $(cc_stack_align)
  82
  83 +ifdef CONFIG_CC_IS_CLANG
  84 +dsc_ccflags += -msse2
  85 +endif
  86 +
  87  CFLAGS_rc_calc.o := $(dsc_ccflags)
  88  CFLAGS_rc_calc_dpi.o := $(dsc_ccflags)
  89  CFLAGS_codec_main_amd.o := $(dsc_ccflags)