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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0819FC433EF for ; Sun, 10 Oct 2021 19:49:54 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C36560EB2 for ; Sun, 10 Oct 2021 19:49:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5C36560EB2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7EAF86E3E3; Sun, 10 Oct 2021 19:49:52 +0000 (UTC) Received: from mx2.smtp.larsendata.com (mx2.smtp.larsendata.com [91.221.196.228]) by gabe.freedesktop.org (Postfix) with ESMTPS id 21D696E3E3 for ; Sun, 10 Oct 2021 19:49:50 +0000 (UTC) Received: from mail01.mxhotel.dk (mail01.mxhotel.dk [91.221.196.236]) by mx2.smtp.larsendata.com (Halon) with ESMTPS id 321868b9-2a03-11ec-ac3c-0050568cd888; Sun, 10 Oct 2021 19:49:35 +0000 (UTC) Received: from ravnborg.org (80-162-45-141-cable.dk.customer.tdc.net [80.162.45.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: sam@ravnborg.org) by mail01.mxhotel.dk (Postfix) with ESMTPSA id ADD26194B18; Sun, 10 Oct 2021 21:49:35 +0200 (CEST) Date: Sun, 10 Oct 2021 21:49:45 +0200 X-Report-Abuse-To: abuse@mxhotel.dk From: Sam Ravnborg To: Randy Dunlap Cc: linux-kernel@vger.kernel.org, David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, Jeff Dike , Richard Weinberger , Anton Ivanov , linux-um@lists.infradead.org Subject: Re: [PATCH v2] drm/r128: fix build for UML Message-ID: References: <20211010172955.30088-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: <20211010172955.30088-1-rdunlap@infradead.org> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Randy, On Sun, Oct 10, 2021 at 10:29:55AM -0700, Randy Dunlap wrote: > Fix a build error on CONFIG_UML, which does not support (provide) > wbinvd(). UML can use the generic mb() instead. > > ../drivers/gpu/drm/r128/ati_pcigart.c: In function ‘drm_ati_pcigart_init’: > ../drivers/gpu/drm/r128/ati_pcigart.c:218:2: error: implicit declaration of function ‘wbinvd’ [-Werror=implicit-function-declaration] > wbinvd(); > ^~~~~~ > > Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver") > Signed-off-by: Randy Dunlap > Cc: David Airlie > Cc: Daniel Vetter > Cc: dri-devel@lists.freedesktop.org > Cc: Jeff Dike > Cc: Richard Weinberger > Cc: Anton Ivanov > Cc: linux-um@lists.infradead.org > --- > v2: update Fixes: tag (thanks, Johannes) > > drivers/gpu/drm/r128/ati_pcigart.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- linux-next-20211007.orig/drivers/gpu/drm/r128/ati_pcigart.c > +++ linux-next-20211007/drivers/gpu/drm/r128/ati_pcigart.c > @@ -215,7 +215,7 @@ int drm_ati_pcigart_init(struct drm_devi > } > ret = 0; > > -#if defined(__i386__) || defined(__x86_64__) > +#if (defined(__i386__) || defined(__x86_64__)) && !defined(CONFIG_UML) > wbinvd(); > #else > mb(); If we look at drivers/video/fbdev/i810/i810_main.h then it looks like we can replace the above with a simple: #ifdef CONFIG_X86 wbinvd(); #else mb(); #endif If you think this would work could you try it out. It would be nicer with the simpler variant. Note: I have no clue what wbinvd() does - seems like some x86 assembler specific thingy. Sam