From patchwork Tue May 8 01:07:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10385031 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 75FE960236 for ; Tue, 8 May 2018 01:14:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FC3F28909 for ; Tue, 8 May 2018 01:14:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60C4F28BAD; Tue, 8 May 2018 01:14:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C1F7328909 for ; Tue, 8 May 2018 01:14:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B3D086E523; Tue, 8 May 2018 01:14:00 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 392 seconds by postgrey-1.36 at gabe; Tue, 08 May 2018 01:13:59 UTC Received: from ozlabs.org (ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8BE3F6E523; Tue, 8 May 2018 01:13:59 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 40g1YN2gwdz9s27; Tue, 8 May 2018 11:07:18 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1525741644; bh=H1Fq8w0HFXVQIGQqmXaFcLTfRkd8rXw6ZfMzJT6dkGs=; h=Date:From:To:Cc:Subject:From; b=moEYH7PUy+5X5HxgI5gpV5WKtR6DGAX++/+axTG4jdZL98lJcrHGb+Kx48cg8pNrz jho4+xXvI5sKhb7lkOC5yYU+ZEDhpdz82myKdIjT1Gs6DWP4HuQ+zUhCSLMCpP+aCT R4vqG60obTxdgVgf0jFAp/W/944AI8LQaBdto8PZdQaxr70kcCm01iFGTeTxkQCmuy kYxhT+uSnHdvJp7ZZjx+KA/5B0yhUObFzhOdRelQkPEeIzd/LNW+a7DM3SzqBGLekb HE+nQnqnKFYHvM4MifFtKUp8q84bFbynBd6ucNX7T24kq8zFsOg2VeoANB7BI4786r QKvP0FrQQ/IYg== Date: Tue, 8 May 2018 11:07:16 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Christoph Hellwig Message-ID: <20180508110716.53dfef41@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Herring , Dave Airlie , Linux Kernel Mailing List , Linux-Next Mailing List , Nipun Gupta , Bjorn Helgaas Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, After merging the drm-intel tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/xen/xen_drm_front.c: In function 'xen_drv_probe': drivers/gpu/drm/xen/xen_drm_front.c:740:10: error: 'struct bus_type' has no member named 'force_dma' dev->bus->force_dma = true; ^~ drivers/gpu/drm/xen/xen_drm_front.c:742:8: error: too few arguments to function 'of_dma_configure' ret = of_dma_configure(dev, NULL); ^~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/xen/xen_drm_front.c:16:0: include/linux/of_device.h:58:5: note: declared here int of_dma_configure(struct device *dev, ^~~~~~~~~~~~~~~~ Caused by commit c575b7eeb89f ("drm/xen-front: Add support for Xen PV display frontend") interacting with commit 3d6ce86ee794 ("drivers: remove force dma flag from buses") from the dma-mapping tree. I have added the following merge fix patch: From: Stephen Rothwell Date: Tue, 8 May 2018 11:02:24 +1000 Subject: [PATCH] drm/xen-front: merge fix for "drivers: remove force dma flag from buses" Signed-off-by: Stephen Rothwell Reviewed-by: Oleksandr Andrushchenko --- drivers/gpu/drm/xen/xen_drm_front.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c index 1b0ea9ac330e..0e486cb1c10c 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.c +++ b/drivers/gpu/drm/xen/xen_drm_front.c @@ -737,9 +737,8 @@ static int xen_drv_probe(struct xenbus_device *xb_dev, * is not correct: to fix this call of_dma_configure() with a NULL * node to set default DMA ops. */ - dev->bus->force_dma = true; dev->coherent_dma_mask = DMA_BIT_MASK(32); - ret = of_dma_configure(dev, NULL); + ret = of_dma_configure(dev, NULL, true); if (ret < 0) { DRM_ERROR("Cannot setup DMA ops, ret %d", ret); return ret;