All of lore.kernel.org
 help / color / mirror / Atom feed
* linux-next: build failure after merge of the drm-intel tree
@ 2018-05-08  1:07 Stephen Rothwell
  2018-05-08  1:19 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
                   ` (3 more replies)
  0 siblings, 4 replies; 12+ messages in thread
From: Stephen Rothwell @ 2018-05-08  1:07 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI, Christoph Hellwig
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Nipun Gupta,
	Bjorn Helgaas, Rob Herring, Dave Airlie

[-- Attachment #1: Type: text/plain, Size: 1974 bytes --]

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 <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

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2018-05-09  5:18 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-08  1:07 linux-next: build failure after merge of the drm-intel tree Stephen Rothwell
2018-05-08  1:19 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2018-05-08  1:36 ` ✗ Fi.CI.BAT: failure " Patchwork
2018-05-08  1:40   ` Stephen Rothwell
2018-05-08  6:11     ` Saarinen, Jani
2018-05-08 12:28     ` Arkadiusz Hiler
2018-05-08  7:08 ` Oleksandr Andrushchenko
2018-05-08  7:08   ` Oleksandr Andrushchenko
2018-05-09  5:02 ` Stephen Rothwell
2018-05-09  5:02   ` Stephen Rothwell
2018-05-09  5:08   ` Christoph Hellwig
2018-05-09  5:18     ` Stephen Rothwell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.