From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A23EC4320A for ; Tue, 27 Jul 2021 09:54:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4B1B861407 for ; Tue, 27 Jul 2021 09:54:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235993AbhG0JyT (ORCPT ); Tue, 27 Jul 2021 05:54:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235950AbhG0JyS (ORCPT ); Tue, 27 Jul 2021 05:54:18 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFA40C061757 for ; Tue, 27 Jul 2021 02:54:17 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id e25-20020a05600c4b99b0290253418ba0fbso1905240wmp.1 for ; Tue, 27 Jul 2021 02:54:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=beCJH86xLgh+PWnNDTz2W15pZAK6+7n66A1y132I0nI=; b=f7AFRSWhC09PBHv+qyLOMMDLZJ13+hH2by60JWMPPbV4z75ecfV1M6W1xDNrqmryQ1 LjwmGYl9ZsrNuM5gb+ejAkOGbLCjv7NL2n4A7ecfBHkMu0P7unNSSQWnZUU3gL+7OKMP aNdN3zGa/6KNJYnA5+0uBll9QAHvb9wviXzcE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :content-transfer-encoding:in-reply-to; bh=beCJH86xLgh+PWnNDTz2W15pZAK6+7n66A1y132I0nI=; b=BmcHcTc3f0GmbPk+HkPquDe55mdy54kKY0l4ubEBuuSj9Bwd6q6DMTsntsT0BJKPI6 MP47/dHff4B1fq0aHqxSP+ZpcstFq2aaL0mZ224+JhzytkdyvphoDxb72WvOfrb21x9I 4byryvQFGDHuOkB2n/dbbP/qsoV/K+OVGTseczE7ry6+Y0M0q2ood7ggoqTBbV7JAoCt biZ6Oj1Q7E8VBccuXitVmaQpL7Gduv7JGyuIa3Qfxp7TS0GDKgE3/AlYIlklyvdYnajX FvV3mN1k8CgIbl2TEMD7wc9AaDfMzrB0FY9JUob7FW/xFTeeE27hcqm4CKx/iCU6/k+1 vsew== X-Gm-Message-State: AOAM532cRkVSMs0BIDDQivK9NdDFuZ8qrVcfQtVJURXF4CiM8Xq3y9F4 si6nDFipSZIEb+VS54Ny2sm8Iw== X-Google-Smtp-Source: ABdhPJzEnmDDN+fwKw7zeJfkVh9bazThBixQhbCRCRYnNIf9WLciebF4U1y3nRTy0MnKsR1OZ/a2kA== X-Received: by 2002:a7b:ce8b:: with SMTP id q11mr20626894wmj.80.1627379656560; Tue, 27 Jul 2021 02:54:16 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id r18sm2664196wrt.96.2021.07.27.02.54.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 02:54:16 -0700 (PDT) Date: Tue, 27 Jul 2021 11:54:14 +0200 From: Daniel Vetter To: Thomas Zimmermann Cc: Randy Dunlap , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Mark Brown , Javier Martinez Canillas , dri-devel@lists.freedesktop.org, linux-next@vger.kernel.org, Ard Biesheuvel Subject: Re: [PATCH] efi: sysfb_efi: fix build when EFI is not set Message-ID: Mail-Followup-To: Thomas Zimmermann , Randy Dunlap , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Mark Brown , Javier Martinez Canillas , dri-devel@lists.freedesktop.org, linux-next@vger.kernel.org, Ard Biesheuvel References: <20210727050447.7339-1-rdunlap@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Operating-System: Linux phenom 5.10.0-7-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org On Tue, Jul 27, 2021 at 11:15:36AM +0200, Thomas Zimmermann wrote: > Hi > > Am 27.07.21 um 07:04 schrieb Randy Dunlap: > > When # CONFIG_EFI is not set, there are 2 definitions of > > sysfb_apply_efi_quirks(). The stub from sysfb.h should be used > > and the __init function from sysfb_efi.c should not be used. > > > > ../drivers/firmware/efi/sysfb_efi.c:337:13: error: redefinition of ‘sysfb_apply_efi_quirks’ > > __init void sysfb_apply_efi_quirks(struct platform_device *pd) > > ^~~~~~~~~~~~~~~~~~~~~~ > > In file included from ../drivers/firmware/efi/sysfb_efi.c:26:0: > > ../include/linux/sysfb.h:65:20: note: previous definition of ‘sysfb_apply_efi_quirks’ was here > > static inline void sysfb_apply_efi_quirks(struct platform_device *pd) > > ^~~~~~~~~~~~~~~~~~~~~~ > > > > Signed-off-by: Randy Dunlap > > Cc: Ard Biesheuvel > > Cc: linux-efi@vger.kernel.org > > Cc: dri-devel@lists.freedesktop.org > > Cc: Javier Martinez Canillas > > Cc: Thomas Zimmermann > > Cc: Mark Brown > > Cc: linux-next@vger.kernel.org > > Thanks for the patch. It should have a fixes line > > > dim fixes 8633ef82f101c040427b57d4df7b706261420b94 > > Fixes: 8633ef82f101 ("drivers/firmware: consolidate EFI framebuffer setup > for all arches") Added this and pushed to drm-next (because atm drm-next isn't in linux-next because of this). drm-next also has -rc3 backmerge for the nouveau fix, so I think a good time to backmerge the entire pile into drm-misc-next? -Daniel > > > ... and maybe a few more of the CCs below > > Cc: Javier Martinez Canillas > > Cc: Borislav Petkov > > Cc: Daniel Vetter > > Cc: Thomas Zimmermann > > Cc: Ard Biesheuvel > > Cc: Paul Walmsley > > Cc: Palmer Dabbelt > > Cc: Albert Ou > > Cc: Greg Kroah-Hartman > > Cc: Linus Walleij > > Cc: Krzysztof Kozlowski > > Cc: John Stultz > > Cc: Colin Ian King > > Cc: Nicolas Saenz Julienne > > Cc: Sudeep Holla > > Cc: Maxime Ripard > > Cc: linux-efi@vger.kernel.org > > Cc: linux-riscv@lists.infradead.org > > > Best regards > Thomas > > > --- > > drivers/firmware/efi/sysfb_efi.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > --- linext-20210726.orig/drivers/firmware/efi/sysfb_efi.c > > +++ linext-20210726/drivers/firmware/efi/sysfb_efi.c > > @@ -332,6 +332,7 @@ static const struct fwnode_operations ef > > .add_links = efifb_add_links, > > }; > > +#ifdef CONFIG_EFI > > static struct fwnode_handle efifb_fwnode; > > __init void sysfb_apply_efi_quirks(struct platform_device *pd) > > @@ -354,3 +355,4 @@ __init void sysfb_apply_efi_quirks(struc > > pd->dev.fwnode = &efifb_fwnode; > > } > > } > > +#endif > > > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch