mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: "Alex Deucher" <alexander.deucher@amd.com>,
	"Harry Wentland" <harry.wentland@amd.com>,
	"Leo Li" <sunpeng.li@amd.com>,
	"Christian König" <christian.koenig@amd.com>,
	"David (ChunMing) Zhou" <David1.Zhou@amd.com>,
	"David Airlie" <airlied@linux.ie>,
	"Daniel Vetter" <daniel@ffwll.ch>
Cc: clang-built-linux@googlegroups.com,
	amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	dri-devel@lists.freedesktop.org, Arnd Bergmann <arnd@arndb.de>,
	Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Subject: [PATCH 4/6] drm/amd/display: fix dcn21 Makefile for clang
Date: Wed,  2 Oct 2019 14:01:25 +0200	[thread overview]
Message-ID: <20191002120136.1777161-5-arnd@arndb.de> (raw)
In-Reply-To: <20191002120136.1777161-1-arnd@arndb.de>

Just like all the other variants, this one passes invalid
compile-time options with clang after the new code got
merged:

clang: error: unknown argument: '-mpreferred-stack-boundary=4'
scripts/Makefile.build:265: recipe for target 'drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_resource.o' failed

Use the same variant that we have for dcn20 to fix compilation.

Fixes: eced51f9babb ("drm/amd/display: Add hubp block for Renoir (v2)")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/Makefile b/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
index 8cd9de8b1a7a..ef673bffc241 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
@@ -3,7 +3,17 @@
 
 DCN21 = dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o
 
-CFLAGS_$(AMDDALPATH)/dc/dcn21/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))
 
-- 
2.20.0


  parent reply	other threads:[~2019-10-02 12:03 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-02 12:01 [PATCH 0/6] amdgpu build fixes Arnd Bergmann
2019-10-02 12:01 ` [PATCH 1/6] drm/amdgpu: make pmu support optional, again Arnd Bergmann
2019-10-02 12:01 ` [PATCH 2/6] drm/amdgpu: hide another #warning Arnd Bergmann
2019-10-02 12:01 ` [PATCH 3/6] drm/amdgpu: display_mode_vba_21: remove uint typedef Arnd Bergmann
2019-10-02 12:01 ` Arnd Bergmann [this message]
2019-10-02 14:17   ` [PATCH 4/6] drm/amd/display: fix dcn21 Makefile for clang Alex Deucher
2019-10-02 14:51     ` Arnd Bergmann
2019-10-02 15:12       ` Alex Deucher
2019-10-02 15:39         ` Arnd Bergmann
2019-10-02 16:33           ` Alex Deucher
2019-10-02 21:14   ` Nick Desaulniers
2019-10-02 21:24     ` Alex Deucher
2019-10-02 21:27       ` Nick Desaulniers
2019-10-02 12:01 ` [PATCH 5/6] [RESEND] drm/amd/display: hide an unused variable Arnd Bergmann
2019-10-02 12:01 ` [PATCH 6/6] [RESEND] drm/amdgpu: work around llvm bug #42576 Arnd Bergmann
2019-10-02 16:51   ` Nick Desaulniers
2019-10-02 17:07     ` Nathan Chancellor
2019-10-02 21:06       ` Nick Desaulniers
2019-10-02 18:47 ` [PATCH 0/6] amdgpu build fixes Alex Deucher
2019-10-02 18:53   ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191002120136.1777161-5-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=Bhawanpreet.Lakha@amd.com \
    --cc=David1.Zhou@amd.com \
    --cc=airlied@linux.ie \
    --cc=alexander.deucher@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=christian.koenig@amd.com \
    --cc=clang-built-linux@googlegroups.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=harry.wentland@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sunpeng.li@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®