linux-next: build failure after merge of the sunxi tree

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: build failure after merge of the sunxi tree
Date	Tue, 07 Mar 2017 05:30:01 +0100
Message-ID	<tieV3-1UI-1@gated-at.bofh.it> (permalink)
X-Original-To	Maxime Ripard <maxime.ripard@free-electrons.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>
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==
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	71
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shawn Guo <shawn.guo@linaro.org>, Chen-Yu Tsai <wens@csie.org>
X-Original-Date	Tue, 7 Mar 2017 11:10:19 +1100
X-Original-Message-ID	<20170307111019.246a9629@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1593905

Show key headers only | View raw

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 <sfr@canb.auug.org.au>
Date: Tue, 7 Mar 2017 11:06:45 +1100
Subject: [PATCH] drm: sun4i: fixup for struct sun4i_crtc changes

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: build failure after merge of the sunxi tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-07 05:30 +0100
  Re: linux-next: build failure after merge of the sunxi tree Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-03-07 22:50 +0100
    Re: linux-next: build failure after merge of the sunxi tree Jani Nikula <jani.nikula@linux.intel.com> - 2017-03-08 09:30 +0100
      Re: linux-next: build failure after merge of the sunxi tree Daniel Vetter <daniel@ffwll.ch> - 2017-03-08 11:30 +0100

csiph-web