All of lore.kernel.org
 help / color / mirror / Atom feed
* linux-next: build failure after merge of the drm-msm tree
@ 2021-07-29 11:28 Mark Brown
  0 siblings, 0 replies; 16+ messages in thread
From: Mark Brown @ 2021-07-29 11:28 UTC (permalink / raw)
  To: Rob Clark, Sean Paul; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

Hi all,

After merging the drm-msm tree, today's linux-next build (arm64
defconfig) failed like this:

/tmp/next/build/drivers/gpu/drm/msm/msm_ringbuffer.c: In function 'msm_ringbuffer_new':
/tmp/next/build/drivers/gpu/drm/msm/msm_ringbuffer.c:104:29: error: passing argument 7 of 'drm_sched_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
  104 |    NULL, to_msm_bo(ring->bo)->name);
In file included from /tmp/next/build/drivers/gpu/drm/msm/msm_ringbuffer.h:10,
                 from /tmp/next/build/drivers/gpu/drm/msm/msm_ringbuffer.c:7:
/tmp/next/build/include/drm/gpu_scheduler.h:345:16: note: expected 'atomic_t *' {aka 'struct <anonymous> *'} but argument is of type 'char *'
  345 |      atomic_t *score, const char *name);
      |      ~~~~~~~~~~^~~~~
/tmp/next/build/drivers/gpu/drm/msm/msm_ringbuffer.c:102:8: error: too few arguments to function 'drm_sched_init'
  102 |  ret = drm_sched_init(&ring->sched, &msm_sched_ops,
      |        ^~~~~~~~~~~~~~
In file included from /tmp/next/build/drivers/gpu/drm/msm/msm_ringbuffer.h:10,
                 from /tmp/next/build/drivers/gpu/drm/msm/msm_ringbuffer.c:7:
/tmp/next/build/include/drm/gpu_scheduler.h:341:5: note: declared here
  341 | int drm_sched_init(struct drm_gpu_scheduler *sched,
      |     ^~~~~~~~~~~~~~
cc1: some warnings being treated as errors

Probably caused by commit

  1d8a5ca436ee4a28ee ("drm/msm: Conversion to drm scheduler")

Since there was previously nothing in the drm-msm tree I've just dropped
the branch.

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

* linux-next: build failure after merge of the drm-msm tree
@ 2022-05-05  1:48 ` Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2022-05-05  1:48 UTC (permalink / raw)
  To: Rob Clark, Sean Paul, Dave Airlie
  Cc: DRI, Thomas Zimmermann, Dmitry Baryshkov, Vinod Koul,
	Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

After merging the drm-msm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from drivers/gpu/drm/msm/msm_gpu.h:17,
                 from drivers/gpu/drm/msm/adreno/adreno_gpu.h:15,
                 from drivers/gpu/drm/msm/adreno/a3xx_gpu.h:10,
                 from drivers/gpu/drm/msm/adreno/a3xx_gpu.c:9:
drivers/gpu/drm/msm/msm_drv.h:33:10: fatal error: drm/drm_dsc.h: No such file or directory
   33 | #include <drm/drm_dsc.h>
      |          ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/msm_gpu.h:17,
                 from drivers/gpu/drm/msm/adreno/adreno_gpu.h:15,
                 from drivers/gpu/drm/msm/adreno/adreno_gpu.c:19:
drivers/gpu/drm/msm/msm_drv.h:33:10: fatal error: drm/drm_dsc.h: No such file or directory
   33 | #include <drm/drm_dsc.h>
      |          ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/msm_gpu.h:17,
                 from drivers/gpu/drm/msm/adreno/adreno_gpu.h:15,
                 from drivers/gpu/drm/msm/adreno/adreno_device.c:9:
drivers/gpu/drm/msm/msm_drv.h:33:10: fatal error: drm/drm_dsc.h: No such file or directory
   33 | #include <drm/drm_dsc.h>
      |          ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/msm_gpu.h:17,
                 from drivers/gpu/drm/msm/adreno/adreno_gpu.h:15,
                 from drivers/gpu/drm/msm/adreno/a2xx_gpu.h:7,
                 from drivers/gpu/drm/msm/adreno/a2xx_gpu.c:4:
drivers/gpu/drm/msm/msm_drv.h:33:10: fatal error: drm/drm_dsc.h: No such file or directory
   33 | #include <drm/drm_dsc.h>
      |          ^~~~~~~~~~~~~~~

Caused by commits

  b9080324d6ca ("drm/msm/dsi: add support for dsc data")
  c110cfd1753e ("drm/msm/disp/dpu1: Add support for DSC")

interacting with commit

  2a64b147350f ("drm/display: Move DSC header and helpers into display-helper module")

from the drm tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 May 2022 11:31:20 +1000
Subject: [PATCH] fix up for "drm/display: Move DSC header and helpers into display-helper module"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 2 +-
 drivers/gpu/drm/msm/msm_drv.h              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h
index 164e5f5b1002..b39ee4ed32f7 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h
@@ -4,7 +4,7 @@
 #ifndef _DPU_HW_DSC_H
 #define _DPU_HW_DSC_H
 
-#include <drm/drm_dsc.h>
+#include <drm/display/drm_dsc.h>
 
 #define DSC_MODE_SPLIT_PANEL            BIT(0)
 #define DSC_MODE_MULTIPLEX              BIT(1)
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index fdbaad53eb84..08388d742d65 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -30,7 +30,7 @@
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_fb_helper.h>
-#include <drm/drm_dsc.h>
+#include <drm/display/drm_dsc.h>
 #include <drm/msm_drm.h>
 #include <drm/drm_gem.h>
 
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the drm-msm tree
@ 2022-05-05  1:48 ` Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2022-05-05  1:48 UTC (permalink / raw)
  To: Rob Clark, Sean Paul, Dave Airlie
  Cc: Linux Kernel Mailing List, DRI, Vinod Koul,
	Linux Next Mailing List, Thomas Zimmermann, Dmitry Baryshkov

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

Hi all,

After merging the drm-msm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from drivers/gpu/drm/msm/msm_gpu.h:17,
                 from drivers/gpu/drm/msm/adreno/adreno_gpu.h:15,
                 from drivers/gpu/drm/msm/adreno/a3xx_gpu.h:10,
                 from drivers/gpu/drm/msm/adreno/a3xx_gpu.c:9:
drivers/gpu/drm/msm/msm_drv.h:33:10: fatal error: drm/drm_dsc.h: No such file or directory
   33 | #include <drm/drm_dsc.h>
      |          ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/msm_gpu.h:17,
                 from drivers/gpu/drm/msm/adreno/adreno_gpu.h:15,
                 from drivers/gpu/drm/msm/adreno/adreno_gpu.c:19:
drivers/gpu/drm/msm/msm_drv.h:33:10: fatal error: drm/drm_dsc.h: No such file or directory
   33 | #include <drm/drm_dsc.h>
      |          ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/msm_gpu.h:17,
                 from drivers/gpu/drm/msm/adreno/adreno_gpu.h:15,
                 from drivers/gpu/drm/msm/adreno/adreno_device.c:9:
drivers/gpu/drm/msm/msm_drv.h:33:10: fatal error: drm/drm_dsc.h: No such file or directory
   33 | #include <drm/drm_dsc.h>
      |          ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/msm_gpu.h:17,
                 from drivers/gpu/drm/msm/adreno/adreno_gpu.h:15,
                 from drivers/gpu/drm/msm/adreno/a2xx_gpu.h:7,
                 from drivers/gpu/drm/msm/adreno/a2xx_gpu.c:4:
drivers/gpu/drm/msm/msm_drv.h:33:10: fatal error: drm/drm_dsc.h: No such file or directory
   33 | #include <drm/drm_dsc.h>
      |          ^~~~~~~~~~~~~~~

Caused by commits

  b9080324d6ca ("drm/msm/dsi: add support for dsc data")
  c110cfd1753e ("drm/msm/disp/dpu1: Add support for DSC")

interacting with commit

  2a64b147350f ("drm/display: Move DSC header and helpers into display-helper module")

from the drm tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 May 2022 11:31:20 +1000
Subject: [PATCH] fix up for "drm/display: Move DSC header and helpers into display-helper module"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 2 +-
 drivers/gpu/drm/msm/msm_drv.h              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h
index 164e5f5b1002..b39ee4ed32f7 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h
@@ -4,7 +4,7 @@
 #ifndef _DPU_HW_DSC_H
 #define _DPU_HW_DSC_H
 
-#include <drm/drm_dsc.h>
+#include <drm/display/drm_dsc.h>
 
 #define DSC_MODE_SPLIT_PANEL            BIT(0)
 #define DSC_MODE_MULTIPLEX              BIT(1)
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index fdbaad53eb84..08388d742d65 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -30,7 +30,7 @@
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_fb_helper.h>
-#include <drm/drm_dsc.h>
+#include <drm/display/drm_dsc.h>
 #include <drm/msm_drm.h>
 #include <drm/drm_gem.h>
 
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the drm-msm tree
@ 2022-05-05  1:43 ` Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2022-05-05  1:43 UTC (permalink / raw)
  To: Rob Clark, Sean Paul, Dave Airlie
  Cc: Thomas Zimmermann, Dmitry Baryshkov, Sankeerth Billakanti, DRI,
	Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

After merging the drm-msm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/msm/dp/dp_display.c:13:10: fatal error: drm/dp/drm_dp_aux_bus.h: No such file or directory
   13 | #include <drm/dp/drm_dp_aux_bus.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  c3bf8e21b38a ("drm/msm/dp: Add eDP support via aux_bus")

interacting with commit

  da68386d9edb ("drm: Rename dp/ to display/")

from the drm tree.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 May 2022 11:41:09 +1000
Subject: [PATCH] fix up for "drm: Rename dp/ to display/"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/msm/dp/dp_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index ed4e26ed20e4..c68d6007c2c6 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -10,7 +10,7 @@
 #include <linux/component.h>
 #include <linux/of_irq.h>
 #include <linux/delay.h>
-#include <drm/dp/drm_dp_aux_bus.h>
+#include <drm/display/drm_dp_aux_bus.h>
 
 #include "msm_drv.h"
 #include "msm_kms.h"
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the drm-msm tree
@ 2022-05-05  1:43 ` Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2022-05-05  1:43 UTC (permalink / raw)
  To: Rob Clark, Sean Paul, Dave Airlie
  Cc: Sankeerth Billakanti, Linux Kernel Mailing List, DRI,
	Linux Next Mailing List, Thomas Zimmermann, Dmitry Baryshkov

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

Hi all,

After merging the drm-msm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/msm/dp/dp_display.c:13:10: fatal error: drm/dp/drm_dp_aux_bus.h: No such file or directory
   13 | #include <drm/dp/drm_dp_aux_bus.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  c3bf8e21b38a ("drm/msm/dp: Add eDP support via aux_bus")

interacting with commit

  da68386d9edb ("drm: Rename dp/ to display/")

from the drm tree.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 May 2022 11:41:09 +1000
Subject: [PATCH] fix up for "drm: Rename dp/ to display/"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/msm/dp/dp_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index ed4e26ed20e4..c68d6007c2c6 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -10,7 +10,7 @@
 #include <linux/component.h>
 #include <linux/of_irq.h>
 #include <linux/delay.h>
-#include <drm/dp/drm_dp_aux_bus.h>
+#include <drm/display/drm_dp_aux_bus.h>
 
 #include "msm_drv.h"
 #include "msm_kms.h"
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the drm-msm tree
  2021-06-18  2:50 ` Stephen Rothwell
@ 2021-06-23  1:02   ` Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2021-06-23  1:02 UTC (permalink / raw)
  To: Rob Clark, Sean Paul; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

On Fri, 18 Jun 2021 12:50:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> [Adding maintainers]
> 
> On Fri, 18 Jun 2021 12:42:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the etnaviv tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > ERROR: modpost: "__aeabi_ldivmod" [drivers/gpu/drm/msm/msm.ko] undefined!
> > ERROR: modpost: "__aeabi_uldivmod" [drivers/gpu/drm/msm/msm.ko] undefined!
> > 
> > I don't know which commit in the drm-msm tree caused the failure, but
> > it is probably in the range 558d4272b60f..7e0230fd096c.
> > 
> > I have used the drm-msm tree from next-20210617 for today.  

I am still seeing this (as of yesterday).

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the drm-msm tree
  2021-06-18  2:42 Stephen Rothwell
@ 2021-06-18  2:50 ` Stephen Rothwell
  2021-06-23  1:02   ` Stephen Rothwell
  0 siblings, 1 reply; 16+ messages in thread
From: Stephen Rothwell @ 2021-06-18  2:50 UTC (permalink / raw)
  To: Rob Clark, Sean Paul; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

[Adding maintainers]

On Fri, 18 Jun 2021 12:42:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the etnaviv tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> ERROR: modpost: "__aeabi_ldivmod" [drivers/gpu/drm/msm/msm.ko] undefined!
> ERROR: modpost: "__aeabi_uldivmod" [drivers/gpu/drm/msm/msm.ko] undefined!
> 
> I don't know which commit in the drm-msm tree caused the failure, but
> it is probably in the range 558d4272b60f..7e0230fd096c.
> 
> I have used the drm-msm tree from next-20210617 for today.

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the drm-msm tree
@ 2021-06-18  2:42 Stephen Rothwell
  2021-06-18  2:50 ` Stephen Rothwell
  0 siblings, 1 reply; 16+ messages in thread
From: Stephen Rothwell @ 2021-06-18  2:42 UTC (permalink / raw)
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

After merging the etnaviv tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

ERROR: modpost: "__aeabi_ldivmod" [drivers/gpu/drm/msm/msm.ko] undefined!
ERROR: modpost: "__aeabi_uldivmod" [drivers/gpu/drm/msm/msm.ko] undefined!

I don't know which commit in the drm-msm tree caused the failure, but
it is probably in the range 558d4272b60f..7e0230fd096c.

I have used the drm-msm tree from next-20210617 for today.

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the drm-msm tree
@ 2018-10-05  1:37 Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2018-10-05  1:37 UTC (permalink / raw)
  To: Rob Clark
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Sharat Masetty

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

Hi Rob,

After merging the drm-msm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arm-linux-gnueabi-ld: drivers/gpu/drm/msm/adreno/a6xx_gpu.o: in function `a6xx_gpu_busy':
a6xx_gpu.c:(.text+0x70): undefined reference to `__aeabi_uldivmod'

Caused by commit

  a2c3c0a54d4c ("drm/msm/a6xx: Add devfreq support for a6xx")

I have used the drm-msm tree from next-20181004 for today.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the drm-msm tree
  2018-07-23  4:50 ` Stephen Rothwell
@ 2018-07-25 12:08   ` Rob Clark
  -1 siblings, 0 replies; 16+ messages in thread
From: Rob Clark @ 2018-07-25 12:08 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Dave Airlie, DRI, Linux-Next Mailing List,
	Linux Kernel Mailing List, Jeykumar Sankaran, Russell King,
	Daniel Vetter

On Mon, Jul 23, 2018 at 12:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Rob,
>
> [Dave, this will presumably soon turn up in the drm tree]
>
> After merging the drm-msm tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c: In function 'dpu_plane_destroy':
> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c:1483:3: error: too few arguments to function 'drm_plane_helper_disable'
>    drm_plane_helper_disable(plane);
>    ^~~~~~~~~~~~~~~~~~~~~~~~
> In file included from drivers/gpu/drm/msm/msm_drv.h:43:0,
>                  from drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c:24:
> include/drm/drm_plane_helper.h:72:5: note: declared here
>  int drm_plane_helper_disable(struct drm_plane *plane,
>      ^~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
>   drm_plane_helper_disable ("drm/msm: Add SDM845 DPU support")
>
> interacting with commit
>
>   070473bcf703 ("drm: add missing ctx argument to plane transitional helpers")
>
> from the drm tree.
>
> I have added this merge fix patch.

This looks like the correct fix.  I'll rebase my msm-next branch to
correct this and the other merge conflict..

BR,
-R

>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 23 Jul 2018 12:47:04 +1000
> Subject: [PATCH] drm: msm: merge fix for drm_plane_helper_disable() API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index d3d7ebf0c394..b640e39ebaca 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -1480,7 +1480,7 @@ static void dpu_plane_destroy(struct drm_plane *plane)
>
>                 mutex_destroy(&pdpu->lock);
>
> -               drm_plane_helper_disable(plane);
> +               drm_plane_helper_disable(plane, NULL);
>
>                 /* this will destroy the states as well */
>                 drm_plane_cleanup(plane);
> --
> 2.18.0
>
> --
> Cheers,
> Stephen Rothwell

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

* Re: linux-next: build failure after merge of the drm-msm tree
@ 2018-07-25 12:08   ` Rob Clark
  0 siblings, 0 replies; 16+ messages in thread
From: Rob Clark @ 2018-07-25 12:08 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Dave Airlie, Daniel Vetter, Linux Kernel Mailing List, DRI,
	Russell King, Linux-Next Mailing List

On Mon, Jul 23, 2018 at 12:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Rob,
>
> [Dave, this will presumably soon turn up in the drm tree]
>
> After merging the drm-msm tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c: In function 'dpu_plane_destroy':
> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c:1483:3: error: too few arguments to function 'drm_plane_helper_disable'
>    drm_plane_helper_disable(plane);
>    ^~~~~~~~~~~~~~~~~~~~~~~~
> In file included from drivers/gpu/drm/msm/msm_drv.h:43:0,
>                  from drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c:24:
> include/drm/drm_plane_helper.h:72:5: note: declared here
>  int drm_plane_helper_disable(struct drm_plane *plane,
>      ^~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
>   drm_plane_helper_disable ("drm/msm: Add SDM845 DPU support")
>
> interacting with commit
>
>   070473bcf703 ("drm: add missing ctx argument to plane transitional helpers")
>
> from the drm tree.
>
> I have added this merge fix patch.

This looks like the correct fix.  I'll rebase my msm-next branch to
correct this and the other merge conflict..

BR,
-R

>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 23 Jul 2018 12:47:04 +1000
> Subject: [PATCH] drm: msm: merge fix for drm_plane_helper_disable() API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index d3d7ebf0c394..b640e39ebaca 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -1480,7 +1480,7 @@ static void dpu_plane_destroy(struct drm_plane *plane)
>
>                 mutex_destroy(&pdpu->lock);
>
> -               drm_plane_helper_disable(plane);
> +               drm_plane_helper_disable(plane, NULL);
>
>                 /* this will destroy the states as well */
>                 drm_plane_cleanup(plane);
> --
> 2.18.0
>
> --
> Cheers,
> Stephen Rothwell
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* linux-next: build failure after merge of the drm-msm tree
@ 2018-07-23  4:50 ` Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2018-07-23  4:50 UTC (permalink / raw)
  To: Rob Clark, Dave Airlie, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Jeykumar Sankaran, Russell King, Daniel Vetter

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

Hi Rob,

[Dave, this will presumably soon turn up in the drm tree]

After merging the drm-msm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c: In function 'dpu_plane_destroy':
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c:1483:3: error: too few arguments to function 'drm_plane_helper_disable'
   drm_plane_helper_disable(plane);
   ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/msm_drv.h:43:0,
                 from drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c:24:
include/drm/drm_plane_helper.h:72:5: note: declared here
 int drm_plane_helper_disable(struct drm_plane *plane,
     ^~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  drm_plane_helper_disable ("drm/msm: Add SDM845 DPU support")

interacting with commit

  070473bcf703 ("drm: add missing ctx argument to plane transitional helpers")

from the drm tree.

I have added this merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 23 Jul 2018 12:47:04 +1000
Subject: [PATCH] drm: msm: merge fix for drm_plane_helper_disable() API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index d3d7ebf0c394..b640e39ebaca 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -1480,7 +1480,7 @@ static void dpu_plane_destroy(struct drm_plane *plane)
 
 		mutex_destroy(&pdpu->lock);
 
-		drm_plane_helper_disable(plane);
+		drm_plane_helper_disable(plane, NULL);
 
 		/* this will destroy the states as well */
 		drm_plane_cleanup(plane);
-- 
2.18.0

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the drm-msm tree
@ 2018-07-23  4:50 ` Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2018-07-23  4:50 UTC (permalink / raw)
  To: Rob Clark, Dave Airlie, DRI
  Cc: Daniel Vetter, Linux-Next Mailing List, Russell King,
	Linux Kernel Mailing List


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

Hi Rob,

[Dave, this will presumably soon turn up in the drm tree]

After merging the drm-msm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c: In function 'dpu_plane_destroy':
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c:1483:3: error: too few arguments to function 'drm_plane_helper_disable'
   drm_plane_helper_disable(plane);
   ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/msm_drv.h:43:0,
                 from drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c:24:
include/drm/drm_plane_helper.h:72:5: note: declared here
 int drm_plane_helper_disable(struct drm_plane *plane,
     ^~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  drm_plane_helper_disable ("drm/msm: Add SDM845 DPU support")

interacting with commit

  070473bcf703 ("drm: add missing ctx argument to plane transitional helpers")

from the drm tree.

I have added this merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 23 Jul 2018 12:47:04 +1000
Subject: [PATCH] drm: msm: merge fix for drm_plane_helper_disable() API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index d3d7ebf0c394..b640e39ebaca 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -1480,7 +1480,7 @@ static void dpu_plane_destroy(struct drm_plane *plane)
 
 		mutex_destroy(&pdpu->lock);
 
-		drm_plane_helper_disable(plane);
+		drm_plane_helper_disable(plane, NULL);
 
 		/* this will destroy the states as well */
 		drm_plane_cleanup(plane);
-- 
2.18.0

-- 
Cheers,
Stephen Rothwell

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

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* linux-next: build failure after merge of the drm-msm tree
@ 2018-06-04  3:20 Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2018-06-04  3:20 UTC (permalink / raw)
  To: Rob Clark
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Sharat Masetty

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

Hi Rob,

After merging the drm-msm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/msm/adreno/a5xx_gpu.o: In function `a5xx_gpu_busy':
a5xx_gpu.c:(.text+0xcc): undefined reference to `__aeabi_uldivmod'

Caused by commit

  dd4ff3063899 ("drm/msm: re-factor devfreq code")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the drm-msm tree
@ 2016-07-11  3:20 Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2016-07-11  3:20 UTC (permalink / raw)
  To: Rob Clark, Mark Brown, Liam Girdwood
  Cc: linux-next, linux-kernel, Srinivas Kandagatla, Kuninori Morimoto,
	Dave Airlie

Hi Rob,

After merging the drm-msm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/msm/hdmi/hdmi.c:523:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .hw_params = msm_hdmi_audio_hw_params,
               ^
drivers/gpu/drm/msm/hdmi/hdmi.c:523:15: note: (near initialization for 'msm_hdmi_audio_codec_ops.hw_params')
drivers/gpu/drm/msm/hdmi/hdmi.c:524:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .audio_shutdown = msm_hdmi_audio_shutdown,
                    ^
drivers/gpu/drm/msm/hdmi/hdmi.c:524:20: note: (near initialization for 'msm_hdmi_audio_codec_ops.audio_shutdown')

Caused by commit

  bf714255fed7 ("drm: msm: Add ASoC generic hdmi audio codec support.")

interacting with commit

  efc9194bcff8 ("ASoC: hdmi-codec: callback function will be called with private data")

from the sound-asoc (and drm) trees.

I have added this merge fix patch for today (dave will need something
like this when he merges your tree):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Jul 2016 13:16:23 +1000
Subject: [PATCH] drm: msm: fix up for "ASoC: hdmi-codec: callback function
 will be called with private data"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/msm/hdmi/hdmi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index aada35547eca..33bf52c6b312 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -438,7 +438,7 @@ static int msm_hdmi_get_gpio(struct device_node *of_node, const char *name)
 /*
  * HDMI audio codec callbacks
  */
-static int msm_hdmi_audio_hw_params(struct device *dev,
+static int msm_hdmi_audio_hw_params(struct device *dev, void *data,
 				    struct hdmi_codec_daifmt *daifmt,
 				    struct hdmi_codec_params *params)
 {
@@ -512,7 +512,7 @@ static int msm_hdmi_audio_hw_params(struct device *dev,
 	return 0;
 }
 
-static void msm_hdmi_audio_shutdown(struct device *dev)
+static void msm_hdmi_audio_shutdown(struct device *dev, void *data)
 {
 	struct hdmi *hdmi = dev_get_drvdata(dev);
 
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell

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

* linux-next: build failure after merge of the drm-msm tree
@ 2015-12-15  1:27 Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2015-12-15  1:27 UTC (permalink / raw)
  To: Rob Clark
  Cc: linux-next, linux-kernel, Ville Syrjälä, Vinay Simha BN

Hi Rob,

After merging the drm-msm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c: In function 'mdp4_dsi_encoder_init':
drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c:187:2: error: too few arguments to function 'drm_encoder_init'
  drm_encoder_init(dev, encoder, &mdp4_dsi_encoder_funcs,
  ^
In file included from include/drm/drmP.h:68:0,
                 from drivers/gpu/drm/msm/msm_drv.h:37,
                 from drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h:21,
                 from drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c:20:
include/drm/drm_crtc.h:2220:5: note: declared here
 int drm_encoder_init(struct drm_device *dev,
     ^

Caused by commit

  776638e73a19 ("drm/msm/dsi: Add a mdp4 encoder for DSI")

interacting withe commit

  13a3d91f17a5 ("drm: Pass 'name' to drm_encoder_init()")

from the drm-misc tree.

I added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Dec 2015 12:23:41 +1100
Subject: [PATCH] drm/msm/dsi: update for drm_encoder_init() API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
index 49052bb5d2e4..2f57e9453b67 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c
@@ -185,7 +185,7 @@ struct drm_encoder *mdp4_dsi_encoder_init(struct drm_device *dev)
 	encoder = &mdp4_dsi_encoder->base;
 
 	drm_encoder_init(dev, encoder, &mdp4_dsi_encoder_funcs,
-			 DRM_MODE_ENCODER_DSI);
+			 DRM_MODE_ENCODER_DSI, NULL);
 	drm_encoder_helper_add(encoder, &mdp4_dsi_encoder_helper_funcs);
 
 	return encoder;
-- 
2.6.2

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

end of thread, other threads:[~2022-05-05  1:49 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-29 11:28 linux-next: build failure after merge of the drm-msm tree Mark Brown
  -- strict thread matches above, loose matches on Subject: below --
2022-05-05  1:48 Stephen Rothwell
2022-05-05  1:48 ` Stephen Rothwell
2022-05-05  1:43 Stephen Rothwell
2022-05-05  1:43 ` Stephen Rothwell
2021-06-18  2:42 Stephen Rothwell
2021-06-18  2:50 ` Stephen Rothwell
2021-06-23  1:02   ` Stephen Rothwell
2018-10-05  1:37 Stephen Rothwell
2018-07-23  4:50 Stephen Rothwell
2018-07-23  4:50 ` Stephen Rothwell
2018-07-25 12:08 ` Rob Clark
2018-07-25 12:08   ` Rob Clark
2018-06-04  3:20 Stephen Rothwell
2016-07-11  3:20 Stephen Rothwell
2015-12-15  1:27 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.