Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752814AbbBXA5f (ORCPT ); Mon, 23 Feb 2015 19:57:35 -0500 Received: from mail-we0-f182.google.com ([74.125.82.182]:33714 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752605AbbBXA5d (ORCPT ); Mon, 23 Feb 2015 19:57:33 -0500 Date: Tue, 24 Feb 2015 01:59:09 +0100 From: Daniel Vetter To: Stephen Rothwell Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Thierry Reding , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Clark , Laurent Pinchart Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: <20150224005909.GN24485@phenom.ffwll.local> Mail-Followup-To: Stephen Rothwell , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Thierry Reding , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Clark , Laurent Pinchart References: <20150224114140.3d310574@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150224114140.3d310574@canb.auug.org.au> X-Operating-System: Linux phenom 3.16-2-amd64 User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2427 Lines: 68 On Tue, Feb 24, 2015 at 11:41:40AM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/gpu/drm/tegra/drm.c: In function 'tegra_atomic_complete': > drivers/gpu/drm/tegra/drm.c:58:2: error: implicit declaration of function 'drm_atomic_helper_commit_pre_planes' [-Werror=implicit-function-declaration] > drm_atomic_helper_commit_pre_planes(drm, state); > ^ > drivers/gpu/drm/tegra/drm.c:60:2: error: implicit declaration of function 'drm_atomic_helper_commit_post_planes' [-Werror=implicit-function-declaration] > drm_atomic_helper_commit_post_planes(drm, state); > ^ > > Caused by commit ad9e7c89a4e4 ("drm/atomic-helper: Rename > commmit_post/pre_planes") interacting with commit 1503ca47d76e > ("drm/tegra: Atomic conversion, phase 3, step 3") from v4.0-rc1. > > I added the following merge fix patch: > > From: Stephen Rothwell > Date: Tue, 24 Feb 2015 11:37:11 +1100 > Subject: [PATCH] drm/atomic-helper: fix for Rename commmit_post/pre_planes > > Signed-off-by: Stephen Rothwell I've squashed this into the relevant patch in drm-misc, thanks for reporting and fixing this. -Daniel > --- > drivers/gpu/drm/tegra/drm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c > index 7dd328d77996..5f1880766110 100644 > --- a/drivers/gpu/drm/tegra/drm.c > +++ b/drivers/gpu/drm/tegra/drm.c > @@ -55,9 +55,9 @@ static void tegra_atomic_complete(struct tegra_drm *tegra, > * current layout. > */ > > - drm_atomic_helper_commit_pre_planes(drm, state); > + drm_atomic_helper_commit_modeset_disables(drm, state); > drm_atomic_helper_commit_planes(drm, state); > - drm_atomic_helper_commit_post_planes(drm, state); > + drm_atomic_helper_commit_modeset_enables(drm, state); > > drm_atomic_helper_wait_for_vblanks(drm, state); > > -- > 2.1.4 > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/