linux-next: build failure after merge of the drm-msm tree
diff mbox series

Message ID 20180723145006.5a26207f@canb.auug.org.au
State New
Headers show
Series
  • linux-next: build failure after merge of the drm-msm tree
Related show

Commit Message

Stephen Rothwell July 23, 2018, 4:50 a.m. UTC
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(-)

Comments

Rob Clark July 25, 2018, 12:08 p.m. UTC | #1
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

Patch
diff mbox series

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