| Message ID | 20170403133129.357df27f@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Thanks for this. This and "drm/vmwgfx: merge fixup for set_config API change": Reviewed-by: Sinclair Yeh <syeh@vmware.com> On Mon, Apr 03, 2017 at 01:31:29PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c: In function 'vmw_sou_crtc_page_flip': > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:327:8: error: too few arguments to function 'drm_atomic_helper_page_flip' > ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); > ^ > In file included from drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:31:0: > include/drm/drm_atomic_helper.h:126:5: note: declared here > int drm_atomic_helper_page_flip(struct drm_crtc *crtc, > ^ > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c: In function 'vmw_stdu_crtc_page_flip': > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:508:8: error: too few arguments to function 'drm_atomic_helper_page_flip' > ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); > ^ > In file included from drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:32:0: > include/drm/drm_atomic_helper.h:126:5: note: declared here > int drm_atomic_helper_page_flip(struct drm_crtc *crtc, > ^ > > Caused by commit > > 41292b1fa13a ("drm: Add acquire ctx parameter to ->page_flip(_target)") > > interacting with commits > > 904bb5e5817f ("drm/vmwgfx: Switch over to internal atomic API for STDU") > b0119cb9229d ("drm/vmwgfx: Switch over to internal atomic API for SOU and LDU") > > from the drm tree. > > I added this merge fix patch for today: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Mon, 3 Apr 2017 13:25:55 +1000 > Subject: [PATCH] drm/vmwgfx: merge fixup for page_flip API change > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > index 02b8f2541dca..8d7dc9def7c2 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > @@ -324,7 +324,7 @@ static int vmw_sou_crtc_page_flip(struct drm_crtc *crtc, > return -EINVAL; > > flags &= ~DRM_MODE_PAGE_FLIP_ASYNC; > - ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); > + ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx); > if (ret) { > DRM_ERROR("Page flip error %d.\n", ret); > return ret; > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > index e59bbcd8b226..bad31bdf09b6 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > @@ -505,7 +505,7 @@ static int vmw_stdu_crtc_page_flip(struct drm_crtc *crtc, > * don't hand it to the helper. > */ > flags &= ~DRM_MODE_PAGE_FLIP_ASYNC; > - ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); > + ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx); > if (ret) { > DRM_ERROR("Page flip error %d.\n", ret); > return ret; > -- > 2.11.0 > > -- > Cheers, > Stephen Rothwell
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c index 02b8f2541dca..8d7dc9def7c2 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c @@ -324,7 +324,7 @@ static int vmw_sou_crtc_page_flip(struct drm_crtc *crtc, return -EINVAL; flags &= ~DRM_MODE_PAGE_FLIP_ASYNC; - ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); + ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx); if (ret) { DRM_ERROR("Page flip error %d.\n", ret); return ret; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c index e59bbcd8b226..bad31bdf09b6 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c @@ -505,7 +505,7 @@ static int vmw_stdu_crtc_page_flip(struct drm_crtc *crtc, * don't hand it to the helper. */ flags &= ~DRM_MODE_PAGE_FLIP_ASYNC; - ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); + ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx); if (ret) { DRM_ERROR("Page flip error %d.\n", ret); return ret;
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c: In function 'vmw_sou_crtc_page_flip': drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:327:8: error: too few arguments to function 'drm_atomic_helper_page_flip' ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); ^ In file included from drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:31:0: include/drm/drm_atomic_helper.h:126:5: note: declared here int drm_atomic_helper_page_flip(struct drm_crtc *crtc, ^ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c: In function 'vmw_stdu_crtc_page_flip': drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:508:8: error: too few arguments to function 'drm_atomic_helper_page_flip' ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags); ^ In file included from drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:32:0: include/drm/drm_atomic_helper.h:126:5: note: declared here int drm_atomic_helper_page_flip(struct drm_crtc *crtc, ^ Caused by commit 41292b1fa13a ("drm: Add acquire ctx parameter to ->page_flip(_target)") interacting with commits 904bb5e5817f ("drm/vmwgfx: Switch over to internal atomic API for STDU") b0119cb9229d ("drm/vmwgfx: Switch over to internal atomic API for SOU and LDU") from the drm tree. I added this merge fix patch for today: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 3 Apr 2017 13:25:55 +1000 Subject: [PATCH] drm/vmwgfx: merge fixup for page_flip API change Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)