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 AA576C433EF for ; Mon, 11 Oct 2021 17:02:07 +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 7174760E90 for ; Mon, 11 Oct 2021 17:02:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7174760E90 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 B0F3A6E904; Mon, 11 Oct 2021 17:02:06 +0000 (UTC) Received: from mx2.smtp.larsendata.com (mx2.smtp.larsendata.com [91.221.196.228]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5D9816E904 for ; Mon, 11 Oct 2021 17:02:05 +0000 (UTC) Received: from mail01.mxhotel.dk (mail01.mxhotel.dk [91.221.196.236]) by mx2.smtp.larsendata.com (Halon) with ESMTPS id ed173cd9-2ab4-11ec-ac3c-0050568cd888; Mon, 11 Oct 2021 17:01:50 +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 50D70194B8C; Mon, 11 Oct 2021 19:01:50 +0200 (CEST) Date: Mon, 11 Oct 2021 19:02:00 +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: <20211011080006.31081-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: <20211011080006.31081-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" On Mon, Oct 11, 2021 at 01:00:06AM -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 > Cc: Sam Ravnborg Applied to drm-misc-fixes. I was not sure if this was urgent enough for fixes but since it fixes the UM build I ended up fast tracking it to master. Sam > --- > v2: update Fixes: tag (Johannes) > Use simple CONFIG_X86 instead of a more complicated expression. (Sam) > > 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__) > +#ifdef CONFIG_X86 > wbinvd(); > #else > mb(); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.smtp.larsendata.com ([91.221.196.228]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mZygf-00AAbF-2d for linux-um@lists.infradead.org; Mon, 11 Oct 2021 17:02:06 +0000 Date: Mon, 11 Oct 2021 19:02:00 +0200 From: Sam Ravnborg Subject: Re: [PATCH v2] drm/r128: fix build for UML Message-ID: References: <20211011080006.31081-1-rdunlap@infradead.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211011080006.31081-1-rdunlap@infradead.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-um" Errors-To: linux-um-bounces+geert=linux-m68k.org@lists.infradead.org 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 T24gTW9uLCBPY3QgMTEsIDIwMjEgYXQgMDE6MDA6MDZBTSAtMDcwMCwgUmFuZHkgRHVubGFwIHdy b3RlOgo+IEZpeCBhIGJ1aWxkIGVycm9yIG9uIENPTkZJR19VTUwsIHdoaWNoIGRvZXMgbm90IHN1 cHBvcnQgKHByb3ZpZGUpCj4gd2JpbnZkKCkuIFVNTCBjYW4gdXNlIHRoZSBnZW5lcmljIG1iKCkg aW5zdGVhZC4KPiAKPiAuLi9kcml2ZXJzL2dwdS9kcm0vcjEyOC9hdGlfcGNpZ2FydC5jOiBJbiBm dW5jdGlvbiDigJhkcm1fYXRpX3BjaWdhcnRfaW5pdOKAmToKPiAuLi9kcml2ZXJzL2dwdS9kcm0v cjEyOC9hdGlfcGNpZ2FydC5jOjIxODoyOiBlcnJvcjogaW1wbGljaXQgZGVjbGFyYXRpb24gb2Yg ZnVuY3Rpb24g4oCYd2JpbnZk4oCZIFstV2Vycm9yPWltcGxpY2l0LWZ1bmN0aW9uLWRlY2xhcmF0 aW9uXQo+ICAgd2JpbnZkKCk7Cj4gICBefn5+fn4KPiAKPiBGaXhlczogNjhmNWQzZjNiNjU0ICgi dW06IGFkZCBQQ0kgb3ZlciB2aXJ0aW8gZW11bGF0aW9uIGRyaXZlciIpCj4gU2lnbmVkLW9mZi1i eTogUmFuZHkgRHVubGFwIDxyZHVubGFwQGluZnJhZGVhZC5vcmc+Cj4gQ2M6IERhdmlkIEFpcmxp ZSA8YWlybGllZEBsaW51eC5pZT4KPiBDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNo Pgo+IENjOiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gQ2M6IEplZmYgRGlrZSA8 amRpa2VAYWRkdG9pdC5jb20+Cj4gQ2M6IFJpY2hhcmQgV2VpbmJlcmdlciA8cmljaGFyZEBub2Qu YXQ+Cj4gQ2M6IEFudG9uIEl2YW5vdiA8YW50b24uaXZhbm92QGNhbWJyaWRnZWdyZXlzLmNvbT4K PiBDYzogbGludXgtdW1AbGlzdHMuaW5mcmFkZWFkLm9yZwo+IENjOiBTYW0gUmF2bmJvcmcgPHNh bUByYXZuYm9yZy5vcmc+CgpBcHBsaWVkIHRvIGRybS1taXNjLWZpeGVzLiBJIHdhcyBub3Qgc3Vy ZSBpZiB0aGlzIHdhcyB1cmdlbnQgZW5vdWdoIGZvcgpmaXhlcyBidXQgc2luY2UgaXQgZml4ZXMg dGhlIFVNIGJ1aWxkIEkgZW5kZWQgdXAgZmFzdCB0cmFja2luZyBpdCB0bwptYXN0ZXIuCgoJU2Ft Cgo+IC0tLQo+IHYyOiB1cGRhdGUgRml4ZXM6IHRhZyAoSm9oYW5uZXMpCj4gICAgIFVzZSBzaW1w bGUgQ09ORklHX1g4NiBpbnN0ZWFkIG9mIGEgbW9yZSBjb21wbGljYXRlZCBleHByZXNzaW9uLiAo U2FtKQo+IAo+ICBkcml2ZXJzL2dwdS9kcm0vcjEyOC9hdGlfcGNpZ2FydC5jIHwgICAgMiArLQo+ ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKPiAKPiAtLS0g bGludXgtbmV4dC0yMDIxMTAwNy5vcmlnL2RyaXZlcnMvZ3B1L2RybS9yMTI4L2F0aV9wY2lnYXJ0 LmMKPiArKysgbGludXgtbmV4dC0yMDIxMTAwNy9kcml2ZXJzL2dwdS9kcm0vcjEyOC9hdGlfcGNp Z2FydC5jCj4gQEAgLTIxNSw3ICsyMTUsNyBAQCBpbnQgZHJtX2F0aV9wY2lnYXJ0X2luaXQoc3Ry dWN0IGRybV9kZXZpCj4gIAl9Cj4gIAlyZXQgPSAwOwo+ICAKPiAtI2lmIGRlZmluZWQoX19pMzg2 X18pIHx8IGRlZmluZWQoX194ODZfNjRfXykKPiArI2lmZGVmIENPTkZJR19YODYKPiAgCXdiaW52 ZCgpOwo+ICAjZWxzZQo+ICAJbWIoKTsKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmxpbnV4LXVtIG1haWxpbmcgbGlzdApsaW51eC11bUBsaXN0cy5pbmZy YWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGlu dXgtdW0K