From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoph Hellwig <hch@lst.de>, Dave Airlie <airlied@linux.ie>
Cc: Rob Herring <robh@kernel.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Nipun Gupta <nipun.gupta@nxp.com>,
Bjorn Helgaas <bhelgaas@google.com>
Subject: Re: linux-next: build failure after merge of the drm-intel tree
Date: Wed, 9 May 2018 15:02:55 +1000 [thread overview]
Message-ID: <20180509150255.38a5b1cc@canb.auug.org.au> (raw)
In-Reply-To: <20180508110716.53dfef41@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 2233 bytes --]
Hi all,
On Tue, 8 May 2018 11:07:16 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
> 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;
> --
> 2.17.0
This is now needed for the merge of the drm and dma-mapping trees.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-05-09 5:02 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-08 1:07 linux-next: build failure after merge of the drm-intel tree Stephen Rothwell
2018-05-08 7:08 ` Oleksandr Andrushchenko
2018-05-09 5:02 ` Stephen Rothwell [this message]
2018-05-09 5:08 ` Christoph Hellwig
2018-05-09 5:18 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-08-26 2:36 Stephen Rothwell
2022-08-26 7:50 ` Jani Nikula
2022-04-26 2:08 Stephen Rothwell
2022-04-26 7:36 ` Jani Nikula
2022-02-15 1:10 Stephen Rothwell
2022-02-15 12:11 ` Jani Nikula
2021-05-21 1:58 Stephen Rothwell
2021-01-19 23:57 Stephen Rothwell
2021-01-21 1:11 ` Stephen Rothwell
[not found] <20191210093957.5120f717@canb.auug.org.au>
[not found] ` <20191210094224.4a294cb7@canb.auug.org.au>
2019-12-11 9:31 ` Jani Nikula
2019-03-27 2:59 Stephen Rothwell
2019-03-27 11:07 ` Joonas Lahtinen
2019-03-27 11:31 ` Stephen Rothwell
2018-07-13 1:54 Stephen Rothwell
2018-07-23 2:29 ` Stephen Rothwell
2016-08-23 1:56 Stephen Rothwell
2016-08-23 16:33 ` Daniel Vetter
2016-05-23 2:24 Stephen Rothwell
2014-04-03 1:24 Stephen Rothwell
2014-03-19 0:53 Stephen Rothwell
2014-03-19 1:18 ` Steven Rostedt
2013-02-15 2:37 Stephen Rothwell
2013-02-15 9:30 ` Daniel Vetter
2013-02-15 16:16 ` Jesse Barnes
2013-02-19 2:01 ` Stephen Rothwell
2013-02-19 10:28 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180509150255.38a5b1cc@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=bhelgaas@google.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hch@lst.de \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nipun.gupta@nxp.com \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).