From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751961AbdDCDbf (ORCPT ); Sun, 2 Apr 2017 23:31:35 -0400 Received: from ozlabs.org ([103.22.144.67]:33003 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751904AbdDCDbc (ORCPT ); Sun, 2 Apr 2017 23:31:32 -0400 Date: Mon, 3 Apr 2017 13:31:29 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Dave Airlie Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Sinclair Yeh Subject: linux-next: build failure after merge of the drm-misc tree Message-ID: <20170403133129.357df27f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 --- 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