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;
On 05/08/2018 04:07 AM, Stephen Rothwell wrote:
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
Thank you, Reviewed-by: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
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;
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
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.
On Wed, May 09, 2018 at 03:02:55PM +1000, Stephen Rothwell wrote:
- 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.
FYI, because the dma_configure change touch so much code and the author wants to base more work on it it actually is in a guranteed stable branch with just those patches:
git://git.infradead.org/users/hch/dma-mapping.git dma-configure
Gitweb:
http://git.infradead.org/users/hch/dma-mapping.git/shortlog/refs/heads/dma-c...
Feel free to pull this into the drm tree.
Hi Christoph,
On Wed, 9 May 2018 07:08:55 +0200 Christoph Hellwig hch@lst.de wrote:
FYI, because the dma_configure change touch so much code and the author wants to base more work on it it actually is in a guranteed stable branch with just those patches:
git://git.infradead.org/users/hch/dma-mapping.git dma-configureGitweb:
http://git.infradead.org/users/hch/dma-mapping.git/shortlog/refs/heads/dma-configureFeel free to pull this into the drm tree.
Thanks for that.
dri-devel@lists.freedesktop.org
-
Christoph Hellwig -
Oleksandr Andrushchenko -
Stephen Rothwell