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

Message ID 20170307111019.246a9629@canb.auug.org.au
State New
Headers show

Commit Message

Stephen Rothwell March 7, 2017, 12:10 a.m. UTC
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(-)

Comments

Maxime Ripard March 7, 2017, 9:39 p.m. UTC | #1
Hi Stephen, Daniel,

On Tue, Mar 07, 2017 at 11:10:19AM +1100, Stephen Rothwell wrote:
> 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 just rebased my tree on top of the latest drm-misc tag
(drm-misc-next-2017-03-06). It should compile, and not have merge
conflicts anymore.

Thanks!
Maxime
Jani Nikula March 8, 2017, 8:26 a.m. UTC | #2
On Tue, 07 Mar 2017, Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> I just rebased my tree on top of the latest drm-misc tag
> (drm-misc-next-2017-03-06). It should compile, and not have merge
> conflicts anymore.

Conflicts happen. Rebasing should not be the standard operating
procedure for fixing them.

BR,
Jani.
Daniel Vetter March 8, 2017, 9:49 a.m. UTC | #3
On Wed, Mar 08, 2017 at 10:26:54AM +0200, Jani Nikula wrote:
> On Tue, 07 Mar 2017, Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> > I just rebased my tree on top of the latest drm-misc tag
> > (drm-misc-next-2017-03-06). It should compile, and not have merge
> > conflicts anymore.
> 
> Conflicts happen. Rebasing should not be the standard operating
> procedure for fixing them.

I think for this one here it's ok, very early in the feature cycle, few
patches, nasty conflict. But yeah the same thing right before the merge
window opens wouldn't be cool.
-Daniel

Patch
diff mbox

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 = {