Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp1151110imw; Wed, 13 Jul 2022 14:45:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tJGDJ0owjO/fgNVZpj6JY8GJVUv/EjKfRWSA6vgHWpmIOQd4uRPGPkSfYELYkWhWG8k8Fl X-Received: by 2002:a17:906:9752:b0:722:f10e:b464 with SMTP id o18-20020a170906975200b00722f10eb464mr5261494ejy.539.1657748730362; Wed, 13 Jul 2022 14:45:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657748730; cv=none; d=google.com; s=arc-20160816; b=rnViMTpqSipBB8sjCKlAXx/EB1NBOjuHhhy760Hx4q4OLoMq45tKGTepxejJZaHDyF 0eO/JSv+DU9ZLXfla2jARMVsH8C9IClXb6dZCcv7417LRwZk8BXHhooDberrh8XOUy5D yJZMKvFq2ji7E/htSgeUKXjnfX89TJ4w/bo0SktCreT4i0xaR0sWOiYu1Yjfmmj5Piqo 0EI+HbN3JKUC13JL5nQgo4ahX9jixHF7uJrcF3CdDXToQkplapbbffi3dNjPcz0HdtIo /vSg+1ltB9dBVjDApyzJ8pequdYXaAw8VmHLgvWV9S9DWDjuKoJBfrnb6nL1QPVWd8ux ru9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=K1bJUmmTrVDRGEbygJ1lyIJ3nFniytzpL0oelw3tmno=; b=m88/A7DhZwaxURa1lVKODCRwnXTvrI+0zZcNJ+ESzuGtXT+a2JOLHDvwRuPDTO9a0p M/4OYFtMcqwdpCSpdZMVjt+hcYbVAHaBQDHoD11g3YFrDJNy+VVz5jfkgNCOlS6MfYBD NJmzUhls2P/RvLlRpolwFVgWQq+ipN7Kq5Q4Q1VOty6AWnnTATtOp90ohD6UhhGGMDPi kNL0fpB7b16FC9xeezVF3OZWvnrkjUtR4YDHHFnSAmGaFFPTb+Ly/u5jdb1L8m5ySGVB jqmdOu3vxk/ZlsiL3WV6PyoiVr41c5CbfMSYkPjpibSkzSicEKwKL4w4Z8Ed0H8cM6Tr LoJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=I3ZDdYVW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hv11-20020a17090760cb00b0072b460163d9si7582496ejc.196.2022.07.13.14.45.05; Wed, 13 Jul 2022 14:45:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=I3ZDdYVW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237545AbiGMVVx (ORCPT + 99 others); Wed, 13 Jul 2022 17:21:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237458AbiGMVVX (ORCPT ); Wed, 13 Jul 2022 17:21:23 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29768E03E for ; Wed, 13 Jul 2022 14:20:54 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id j22so22094013ejs.2 for ; Wed, 13 Jul 2022 14:20:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=K1bJUmmTrVDRGEbygJ1lyIJ3nFniytzpL0oelw3tmno=; b=I3ZDdYVWtVBT1OSPDYC8/kySJQmls+2J13dZplXCWH7RblLr+tzs9e1lGC5+IPPSk/ Ir6IQSFBTYlC1CGSh6H2OpjjjeOdrOljpSJMxdP1OpaCiRkCqJ7JX1dASIOpa++eFtlI 0hxXI+asTIeVcEFUNKrLjcWtHHcQWju6Il2qbJKozpu3qon4Yujq3r0lfCzMRY+BzQHX bQoZp4ScntrtQyJZCzeupFeD0ziREeqH3Wb5ugKj2lxbH7Cg8zbM/KctdEbiNzsbthNI TgyIihJ9J8unW2/SsAtDrXT+kdrA62HK6SFcsYJQjmQlCFKoDWNH6L5oxGQPlN44A6cP d3dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=K1bJUmmTrVDRGEbygJ1lyIJ3nFniytzpL0oelw3tmno=; b=kI+E555UqFUMR+HsZRPsb7e/roFTku4xNvKQBoEuvvmU+RwE280HeKIb60V3g+eSdM SysGPUvHNLljQXSmeWtmuYh/fCr+ibLd2KefmSNmUpyDYOCMhWPo3GY3VYiLIZvI70KD hg9eTWpyxRfPw2uTNowIKfGKCJxDVc0wmQ7jLY8ineH5hbYpcmkJ+Rh9FZPfor0bgutZ u8Zt49tI+BdXxIciJY5/Av1wpGY/KNOExNgSnnjqNFvrGcr1TVCbicem0MF+4dqY6sXr +grBmjWjV+JnNR+6swf1fGDlh3H3NInUnQ6pzf3Y7QSGGywhV7zefQ7iuF4TPjI16rCF uWTw== X-Gm-Message-State: AJIora9EiCwByw6A3pUp/WzEiODfjKcDywgOB0Bo47GpqXJCIJV86o0q a+XAEBsS5Z3d6p9Eby9IvC1DbWDGSVgX2gVSLBM= X-Received: by 2002:a17:906:5d0b:b0:726:a043:fcb4 with SMTP id g11-20020a1709065d0b00b00726a043fcb4mr5282475ejt.508.1657747252690; Wed, 13 Jul 2022 14:20:52 -0700 (PDT) MIME-Version: 1.0 References: <20220618232737.2036722-1-linux@roeck-us.net> <584fc348-7a60-26a2-af61-9edc4f4830e4@amd.com> <6a026c9a-c4ee-deba-e028-4c0f478c1911@roeck-us.net> In-Reply-To: <6a026c9a-c4ee-deba-e028-4c0f478c1911@roeck-us.net> From: Alex Deucher Date: Wed, 13 Jul 2022 17:20:40 -0400 Message-ID: Subject: Re: [PATCH] drm/amd/display: Add missing hard-float compile flags for PPC64 builds To: Guenter Roeck Cc: Rodrigo Siqueira Jordao , Harry Wentland , Leo Li , Michael Ellerman , LKML , amd-gfx list , David Airlie , Maling list - DRI developers , Alex Deucher , =?UTF-8?Q?Christian_K=C3=B6nig?= , Daniel Axtens Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 13, 2022 at 5:18 PM Guenter Roeck wrote: > > On 7/13/22 13:57, Alex Deucher wrote: > > On Thu, Jun 30, 2022 at 5:01 PM Rodrigo Siqueira Jordao > > wrote: > >> > >> > >> > >> On 2022-06-18 19:27, Guenter Roeck wrote: > >>> ppc:allmodconfig builds fail with the following error. > >>> > >>> powerpc64-linux-ld: > >>> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.o > >>> uses hard float, > >>> drivers/gpu/drm/amd/amdgpu/../display/dc/dcn31/dcn31_resource.o > >>> uses soft float > >>> powerpc64-linux-ld: > >>> failed to merge target specific data of file > >>> drivers/gpu/drm/amd/amdgpu/../display/dc/dcn31/dcn31_resource.o > >>> powerpc64-linux-ld: > >>> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.o > >>> uses hard float, > >>> drivers/gpu/drm/amd/amdgpu/../display/dc/dcn315/dcn315_resource.o > >>> uses soft float > >>> powerpc64-linux-ld: > >>> failed to merge target specific data of > >>> file drivers/gpu/drm/amd/amdgpu/../display/dc/dcn315/dcn315_resource.o > >>> powerpc64-linux-ld: > >>> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.o > >>> uses hard float, > >>> drivers/gpu/drm/amd/amdgpu/../display/dc/dcn316/dcn316_resource.o > >>> uses soft float > >>> powerpc64-linux-ld: > >>> failed to merge target specific data of file > >>> drivers/gpu/drm/amd/amdgpu/../display/dc/dcn316/dcn316_resource.o > >>> > >>> The problem was introduced with commit 41b7a347bf14 ("powerpc: Book3S > >>> 64-bit outline-only KASAN support") which adds support for KASAN. This > >>> commit in turn enables DRM_AMD_DC_DCN because KCOV_INSTRUMENT_ALL and > >>> KCOV_ENABLE_COMPARISONS are no longer enabled. As result, new files are > >>> compiled which lack the selection of hard-float. > >>> > >>> Fixes: 41b7a347bf14 ("powerpc: Book3S 64-bit outline-only KASAN support") > >>> Cc: Michael Ellerman > >>> Cc: Daniel Axtens > >>> Signed-off-by: Guenter Roeck > >>> --- > >>> drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 4 ++++ > >>> drivers/gpu/drm/amd/display/dc/dcn315/Makefile | 4 ++++ > >>> drivers/gpu/drm/amd/display/dc/dcn316/Makefile | 4 ++++ > >>> 3 files changed, 12 insertions(+) > >>> > >>> diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/Makefile b/drivers/gpu/drm/amd/display/dc/dcn31/Makefile > >>> index ec041e3cda30..74be02114ae4 100644 > >>> --- a/drivers/gpu/drm/amd/display/dc/dcn31/Makefile > >>> +++ b/drivers/gpu/drm/amd/display/dc/dcn31/Makefile > >>> @@ -15,6 +15,10 @@ DCN31 = dcn31_resource.o dcn31_hubbub.o dcn31_hwseq.o dcn31_init.o dcn31_hubp.o > >>> dcn31_apg.o dcn31_hpo_dp_stream_encoder.o dcn31_hpo_dp_link_encoder.o \ > >>> dcn31_afmt.o dcn31_vpg.o > >>> > >>> +ifdef CONFIG_PPC64 > >>> +CFLAGS_$(AMDDALPATH)/dc/dcn31/dcn31_resource.o := -mhard-float -maltivec > >>> +endif > >>> + > >>> AMD_DAL_DCN31 = $(addprefix $(AMDDALPATH)/dc/dcn31/,$(DCN31)) > >>> > >>> AMD_DISPLAY_FILES += $(AMD_DAL_DCN31) > >>> diff --git a/drivers/gpu/drm/amd/display/dc/dcn315/Makefile b/drivers/gpu/drm/amd/display/dc/dcn315/Makefile > >>> index 59381d24800b..1395c1ced8c5 100644 > >>> --- a/drivers/gpu/drm/amd/display/dc/dcn315/Makefile > >>> +++ b/drivers/gpu/drm/amd/display/dc/dcn315/Makefile > >>> @@ -25,6 +25,10 @@ > >>> > >>> DCN315 = dcn315_resource.o > >>> > >>> +ifdef CONFIG_PPC64 > >>> +CFLAGS_$(AMDDALPATH)/dc/dcn315/dcn315_resource.o := -mhard-float -maltivec > >>> +endif > >>> + > >>> AMD_DAL_DCN315 = $(addprefix $(AMDDALPATH)/dc/dcn315/,$(DCN315)) > >>> > >>> AMD_DISPLAY_FILES += $(AMD_DAL_DCN315) > >>> diff --git a/drivers/gpu/drm/amd/display/dc/dcn316/Makefile b/drivers/gpu/drm/amd/display/dc/dcn316/Makefile > >>> index 819d44a9439b..c3d2dd78f1e2 100644 > >>> --- a/drivers/gpu/drm/amd/display/dc/dcn316/Makefile > >>> +++ b/drivers/gpu/drm/amd/display/dc/dcn316/Makefile > >>> @@ -25,6 +25,10 @@ > >>> > >>> DCN316 = dcn316_resource.o > >>> > >>> +ifdef CONFIG_PPC64 > >>> +CFLAGS_$(AMDDALPATH)/dc/dcn316/dcn316_resource.o := -mhard-float -maltivec > >>> +endif > >>> + > >>> AMD_DAL_DCN316 = $(addprefix $(AMDDALPATH)/dc/dcn316/,$(DCN316)) > >>> > >>> AMD_DISPLAY_FILES += $(AMD_DAL_DCN316) > >> > >> Hi, > >> > >> I don't want to re-introduce those FPU flags for DCN31/DCN314/DCN316 > >> since we fully isolate FPU operations for those ASICs inside the DML > > > > I don't understand why we don't need to add the hard-float flags back > > on the other DCN blocks. Did we miss something in the DML cleanup for > > DCN 3.1.x? Anyway, at this point, the patch is: > > Acked-by: Alex Deucher > > We can sort the rest out for 5.20. > > > > The problem is not the FPU operations, but the fact that soft-float > and hard-float compiled code is linked together. The soft-float and > hard-float ABIs on powerpc are not compatible, so one ends up with > an object file which is partially soft-float and partially hard-float > compiled and thus uses different ABIs. That can only create chaos, > so the linker complains about it. I get that, I just don't see why only DCN 3.1.x files have this problem. The DCN 2.x files should as well. Alex