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
* ✗ Fi.CI.CHECKPATCH: warning for linux-next: build failure after merge of the drm-intel tree
  2018-05-08  1:07 linux-next: build failure after merge of the drm-intel tree Stephen Rothwell
@ 2018-05-08  1:19 ` Patchwork
  2018-05-08  1:36 ` ✗ Fi.CI.BAT: failure " Patchwork
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2018-05-08  1:19 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: intel-gfx

== Series Details ==

Series: linux-next: build failure after merge of the drm-intel tree
URL   : https://patchwork.freedesktop.org/series/42839/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
3c1454cc91d5 linux-next: build failure after merge of the drm-intel tree
-:25: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit c575b7eeb89f ("drm/xen-front: Add support for Xen PV display frontend")'
#25: 
  c575b7eeb89f ("drm/xen-front: Add support for Xen PV display frontend")

-:37: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#37: 
Subject: [PATCH] drm/xen-front: merge fix for "drivers: remove force dma flag from buses"

total: 1 errors, 1 warnings, 0 checks, 10 lines checked

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* ✗ Fi.CI.BAT: failure for linux-next: build failure after merge of the drm-intel tree
  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 ` Patchwork
  2018-05-08  1:40   ` Stephen Rothwell
  2018-05-08  7:08   ` Oleksandr Andrushchenko
  2018-05-09  5:02   ` Stephen Rothwell
  3 siblings, 1 reply; 12+ messages in thread
From: Patchwork @ 2018-05-08  1:36 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: intel-gfx

== Series Details ==

Series: linux-next: build failure after merge of the drm-intel tree
URL   : https://patchwork.freedesktop.org/series/42839/
State : failure

== Summary ==

= CI Bug Log - changes from CI_DRM_4152 -> Patchwork_8931 =

== Summary - FAILURE ==

  Serious unknown changes coming with Patchwork_8931 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_8931, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/42839/revisions/1/mbox/

== Possible new issues ==

  Here are the unknown changes that may have been introduced in Patchwork_8931:

  === IGT changes ===

    ==== Possible regressions ====

    igt@kms_flip@basic-flip-vs-wf_vblank:
      fi-hsw-4200u:       PASS -> FAIL

    
== Known issues ==

  Here are the changes found in Patchwork_8931 that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-cnl-psr:         PASS -> DMESG-WARN (fdo#104951)

    
    ==== Possible fixes ====

    igt@kms_flip@basic-flip-vs-wf_vblank:
      fi-skl-6770hq:      FAIL (fdo#103928, fdo#100368) -> PASS

    
  fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
  fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
  fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951


== Participating hosts (41 -> 37) ==

  Missing    (4): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-skl-6700hq 


== Build changes ==

    * Linux: CI_DRM_4152 -> Patchwork_8931

  CI_DRM_4152: 06e15c0f055b8b8e326bb65fa83f69b1b7391e51 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4464: 1bb318b32db003a377da14715c7b80675a712b6b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_8931: 3c1454cc91d53c9b6782b9fd72071fcf24e6fe3f @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4464: 33e58d5583eb7ed3966a1b905f875a1dfa959f6b @ git://anongit.freedesktop.org/piglit


== Linux commits ==

3c1454cc91d5 linux-next: build failure after merge of the drm-intel tree

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8931/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for linux-next: build failure after merge of the drm-intel tree
  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
  0 siblings, 2 replies; 12+ messages in thread
From: Stephen Rothwell @ 2018-05-08  1:40 UTC (permalink / raw)
  To: intel-gfx


[-- Attachment #1.1: Type: text/plain, Size: 484 bytes --]

Hi all,

On Tue, 08 May 2018 01:36:25 -0000 Patchwork <patchwork@emeril.freedesktop.org> wrote:
>
> == Series Details ==
> 
> Series: linux-next: build failure after merge of the drm-intel tree
> URL   : https://patchwork.freedesktop.org/series/42839/
> State : failure

Blah, blah :-)

Can someone please arrange for my linux-next merge fix patches to not
be fed into your patchwork/ci as they will never work out side
linux-next ...

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

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for linux-next: build failure after merge of the drm-intel tree
  2018-05-08  1:40   ` Stephen Rothwell
@ 2018-05-08  6:11     ` Saarinen, Jani
  2018-05-08 12:28     ` Arkadiusz Hiler
  1 sibling, 0 replies; 12+ messages in thread
From: Saarinen, Jani @ 2018-05-08  6:11 UTC (permalink / raw)
  To: intel-gfx, Sarvela, Tomi P, Hiler, Arkadiusz

HI, 
> -----Original Message-----
> From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of
> Stephen Rothwell
> Sent: tiistai 8. toukokuuta 2018 4.41
> To: intel-gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] ✗ Fi.CI.BAT: failure for linux-next: build failure after
> merge of the drm-intel tree
> 
> Hi all,
> 
> On Tue, 08 May 2018 01:36:25 -0000 Patchwork
> <patchwork@emeril.freedesktop.org> wrote:
> >
> > == Series Details ==
> >
> > Series: linux-next: build failure after merge of the drm-intel tree
> > URL   : https://patchwork.freedesktop.org/series/42839/
> > State : failure
> 
> Blah, blah :-)
> 
> Can someone please arrange for my linux-next merge fix patches to not be fed
> into your patchwork/ci as they will never work out side linux-next ...
Tomi, Arek? What can be done if any? 
> 
> --
> Cheers,
> Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: linux-next: build failure after merge of the drm-intel tree
  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-08  1:36 ` ✗ Fi.CI.BAT: failure " Patchwork
                     ` (2 subsequent siblings)
  3 siblings, 0 replies; 12+ messages in thread
From: Oleksandr Andrushchenko @ 2018-05-08  7:08 UTC (permalink / raw)
  To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI, Christoph Hellwig
  Cc: Dave Airlie, Linux Kernel Mailing List, Linux-Next Mailing List,
	Nipun Gupta, Bjorn Helgaas

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

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: linux-next: build failure after merge of the drm-intel tree
@ 2018-05-08  7:08   ` Oleksandr Andrushchenko
  0 siblings, 0 replies; 12+ messages in thread
From: Oleksandr Andrushchenko @ 2018-05-08  7:08 UTC (permalink / raw)
  To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI, Christoph Hellwig
  Cc: Dave Airlie, Bjorn Helgaas, Linux-Next Mailing List,
	Linux Kernel Mailing List, Nipun Gupta

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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for linux-next: build failure after merge of the drm-intel tree
  2018-05-08  1:40   ` Stephen Rothwell
  2018-05-08  6:11     ` Saarinen, Jani
@ 2018-05-08 12:28     ` Arkadiusz Hiler
  1 sibling, 0 replies; 12+ messages in thread
From: Arkadiusz Hiler @ 2018-05-08 12:28 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Tomi Sarvela, intel-gfx

On Tue, May 08, 2018 at 11:40:52AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 08 May 2018 01:36:25 -0000 Patchwork <patchwork@emeril.freedesktop.org> wrote:
> >
> > == Series Details ==
> > 
> > Series: linux-next: build failure after merge of the drm-intel tree
> > URL   : https://patchwork.freedesktop.org/series/42839/
> > State : failure
> 
> Blah, blah :-)
> 
> Can someone please arrange for my linux-next merge fix patches to not
> be fed into your patchwork/ci as they will never work out side
> linux-next ...

Hey,

Sorry for clotting your inbox with those mails but I have to ask how
annoying is getting those results?

If it's bearable I would prefer to not introduce special cases basing on
contents of the mbox and/or its author. As of our CI we are not really
that much concerned with wasting time on something that wasn't meant to
be tested - such patches are extremely rare.


If this is necessary - do you have any suggestion how it should be done?
Filtering by "linux-next" in the Subject? By your name? Email address?

Is it the case that linux-next can appear only in untestable patches?
Is silently ignoring such a patch by the CI really okay?

Maybe we should introduce [NOCI] subject tag?
Would you remember to include it?


As of instant solution - you can include "X-Patchwork-Hint: comment" in
the headers, so patchwork won't recognize your email as a patch.

-- 
Cheers,
Arek
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: linux-next: build failure after merge of the drm-intel tree
  2018-05-08  1:07 linux-next: build failure after merge of the drm-intel tree Stephen Rothwell
@ 2018-05-09  5:02   ` Stephen Rothwell
  2018-05-08  1:36 ` ✗ Fi.CI.BAT: failure " Patchwork
                     ` (2 subsequent siblings)
  3 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2018-05-09  5:02 UTC (permalink / raw)
  To: Christoph Hellwig, Dave Airlie
  Cc: Daniel Vetter, Intel Graphics, DRI, Linux-Next Mailing List,
	Linux Kernel Mailing List, Nipun Gupta, Bjorn Helgaas,
	Rob Herring

[-- Attachment #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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: linux-next: build failure after merge of the drm-intel tree
@ 2018-05-09  5:02   ` Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2018-05-09  5:02 UTC (permalink / raw)
  To: Christoph Hellwig, Dave Airlie
  Cc: Rob Herring, Daniel Vetter, Intel Graphics,
	Linux Kernel Mailing List, DRI, Linux-Next Mailing List,
	Nipun Gupta, Bjorn Helgaas


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

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: linux-next: build failure after merge of the drm-intel tree
  2018-05-09  5:02   ` Stephen Rothwell
  (?)
@ 2018-05-09  5:08   ` Christoph Hellwig
  2018-05-09  5:18     ` Stephen Rothwell
  -1 siblings, 1 reply; 12+ messages in thread
From: Christoph Hellwig @ 2018-05-09  5:08 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Christoph Hellwig, Dave Airlie, Daniel Vetter, Intel Graphics,
	DRI, Linux-Next Mailing List, Linux Kernel Mailing List,
	Nipun Gupta, Bjorn Helgaas, Rob Herring

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-configure
  
Feel free to pull this into the drm tree.

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: linux-next: build failure after merge of the drm-intel tree
  2018-05-09  5:08   ` Christoph Hellwig
@ 2018-05-09  5:18     ` Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2018-05-09  5:18 UTC (permalink / raw)
  To: Christoph Hellwig
  Cc: Dave Airlie, Daniel Vetter, Intel Graphics, DRI,
	Linux-Next Mailing List, Linux Kernel Mailing List, Nipun Gupta,
	Bjorn Helgaas, Rob Herring

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

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-configure
> 
> Gitweb:
> 
>     http://git.infradead.org/users/hch/dma-mapping.git/shortlog/refs/heads/dma-configure
>   
> Feel free to pull this into the drm tree.

Thanks for that.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[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.