From: Rob Clark <robdclark@gmail.com> To: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Jeykumar Sankaran <jsanka@codeaurora.org>, Russell King <rmk+kernel@armlinux.org.uk>, Daniel Vetter <daniel.vetter@ffwll.ch> Subject: Re: linux-next: build failure after merge of the drm-msm tree Date: Wed, 25 Jul 2018 08:08:33 -0400 [thread overview] Message-ID: <CAF6AEGsX6p853OG-e_PN6umpG0aM0hr0KvecOKJ+bbLi2362nQ@mail.gmail.com> (raw) In-Reply-To: <20180723145006.5a26207f@canb.auug.org.au> 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
WARNING: multiple messages have this Message-ID (diff)
From: Rob Clark <robdclark@gmail.com> To: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Dave Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, DRI <dri-devel@lists.freedesktop.org>, Russell King <rmk+kernel@armlinux.org.uk>, Linux-Next Mailing List <linux-next@vger.kernel.org> Subject: Re: linux-next: build failure after merge of the drm-msm tree Date: Wed, 25 Jul 2018 08:08:33 -0400 [thread overview] Message-ID: <CAF6AEGsX6p853OG-e_PN6umpG0aM0hr0KvecOKJ+bbLi2362nQ@mail.gmail.com> (raw) In-Reply-To: <20180723145006.5a26207f@canb.auug.org.au> 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
next prev parent reply other threads:[~2018-07-25 12:08 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-23 4:50 linux-next: build failure after merge of the drm-msm tree Stephen Rothwell 2018-07-23 4:50 ` Stephen Rothwell 2018-07-25 12:08 ` Rob Clark [this message] 2018-07-25 12:08 ` Rob Clark -- strict thread matches above, loose matches on Subject: below -- 2023-12-11 0:59 Stephen Rothwell 2023-12-11 0:59 ` Stephen Rothwell 2023-10-10 1:54 Stephen Rothwell 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-07-29 11:28 Mark Brown 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-06-04 3:20 Stephen Rothwell 2016-07-11 3:20 Stephen Rothwell 2015-12-15 1:27 Stephen Rothwell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAF6AEGsX6p853OG-e_PN6umpG0aM0hr0KvecOKJ+bbLi2362nQ@mail.gmail.com \ --to=robdclark@gmail.com \ --cc=airlied@linux.ie \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=jsanka@codeaurora.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=rmk+kernel@armlinux.org.uk \ --cc=sfr@canb.auug.org.au \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.