Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754612AbdCGEYi (ORCPT ); Mon, 6 Mar 2017 23:24:38 -0500 Received: from ozlabs.org ([103.22.144.67]:50093 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754148AbdCGEYa (ORCPT ); Mon, 6 Mar 2017 23:24:30 -0500 Date: Tue, 7 Mar 2017 11:10:19 +1100 From: Stephen Rothwell To: Maxime Ripard , Daniel Vetter , Intel Graphics , DRI Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shawn Guo , Chen-Yu Tsai Subject: linux-next: build failure after merge of the sunxi tree Message-ID: <20170307111019.246a9629@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 Content-Length: 2302 Lines: 71 Hi all, After merging the sunxi tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_enable_vblank': drivers/gpu/drm/sun4i/sun4i_crtc.c:109:31: error: 'struct sun4i_crtc' has no member named 'drv' struct sun4i_drv *drv = scrtc->drv; ^ drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_disable_vblank': drivers/gpu/drm/sun4i/sun4i_crtc.c:121:31: error: 'struct sun4i_crtc' has no member named 'drv' struct sun4i_drv *drv = scrtc->drv; ^ Caused by commit 50480a78e282 ("drm: sun4i: use vblank hooks in struct drm_crtc_funcs") from the drm-misc tree interacting with commit 1b8d109585df ("drm/sun4i: Add backend and tcon pointers to sun4i_crtc") from the sunxi tree. I added this merge fix patch: From: Stephen Rothwell Date: Tue, 7 Mar 2017 11:06:45 +1100 Subject: [PATCH] drm: sun4i: fixup for struct sun4i_crtc changes Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/sun4i/sun4i_crtc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c index a1634ff6eb40..7bbcedff9f07 100644 --- a/drivers/gpu/drm/sun4i/sun4i_crtc.c +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c @@ -106,11 +106,10 @@ static const struct drm_crtc_helper_funcs sun4i_crtc_helper_funcs = { static int sun4i_crtc_enable_vblank(struct drm_crtc *crtc) { struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc); - struct sun4i_drv *drv = scrtc->drv; DRM_DEBUG_DRIVER("Enabling VBLANK on crtc %p\n", crtc); - sun4i_tcon_enable_vblank(drv->tcon, true); + sun4i_tcon_enable_vblank(scrtc->tcon, true); return 0; } @@ -118,11 +117,10 @@ static int sun4i_crtc_enable_vblank(struct drm_crtc *crtc) static void sun4i_crtc_disable_vblank(struct drm_crtc *crtc) { struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc); - struct sun4i_drv *drv = scrtc->drv; DRM_DEBUG_DRIVER("Disabling VBLANK on crtc %p\n", crtc); - sun4i_tcon_enable_vblank(drv->tcon, false); + sun4i_tcon_enable_vblank(scrtc->tcon, false); } static const struct drm_crtc_funcs sun4i_crtc_funcs = { -- 2.11.0 -- Cheers, Stephen Rothwell