From patchwork Tue Mar 7 00:10:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9607883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0654B602B4 for ; Tue, 7 Mar 2017 00:10:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC079281F9 for ; Tue, 7 Mar 2017 00:10:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC8E328470; Tue, 7 Mar 2017 00:10:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 808BD281F9 for ; Tue, 7 Mar 2017 00:10:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D3A86E57B; Tue, 7 Mar 2017 00:10:23 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id DC70A6E57B; Tue, 7 Mar 2017 00:10:21 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3vccVg4N4yz9sNS; Tue, 7 Mar 2017 11:10:19 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1488845419; bh=9fXik/e6b3tOAVLmkJjr5LxRdMQu0NN5yQI0TSKuSzM=; h=Date:From:To:Cc:Subject:From; b=D9A5xhG4JgP+hFSA2d4Oi1DWEx3f4lc6W2EBDDj5FhIR2KITM/rl6A+CjUzaCA1yS kqBlL8m/xIEj16BI0zd29o+KmRh+dSAocEPcSAz7wbkDTwIaHu8ll7cGz1kxLdtK3e sc+WXbCQk0m8lbaD2DP7o8C5/8I4m4ijBus16CfpatFbjuDLB9owZZmlionvdjNFwz jHNrTdW71hut8EyzfE8SV+zjKbIRseY779O0hrN9DdaMr/fwZ9/9aSItI7HVksKAR8 t+cv9JkN6FCRVA6D/BZZgXKYRtdQk1HE39qcJnrJz74jSHnShs7cGVDrzlNWtYQGSu TkHkYOOgR3SPw== Date: Tue, 7 Mar 2017 11:10:19 +1100 From: Stephen Rothwell To: Maxime Ripard , Daniel Vetter , Intel Graphics , DRI Message-ID: <20170307111019.246a9629@canb.auug.org.au> MIME-Version: 1.0 Cc: Chen-Yu Tsai , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shawn Guo Subject: [Intel-gfx] linux-next: build failure after merge of the sunxi tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP 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 = {