[Intel-gfx] linux-next: build failure after merge of the sunxi tree

[Stephen Rothwell]

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 at 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 at 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