[drm-tip:drm-tip 711/734] drivers/gpu/drm/rcar-du/rcar_du_vsp.c:317:6: error: 'struct rcar_du_vsp_plane_state' has no member named 'alpha'

[Laurent Pinchart]

Hello,

On Tuesday, 15 May 2018 17:24:52 EEST kbuild test robot wrote:
> tree:   git://anongit.freedesktop.org/drm/drm-tip drm-tip
> head:   c03987223c762e4a61142f0a9be6027bb181cdfa
> commit: 9037d4b98b255979c6636045794775f5a89cc623 [711/734] Merge branch
> 'drm/du/next' of git://linuxtv.org/pinchartl/media into drm-next config:
> arm64-defconfig (attached as .config)
> compiler: aarch64-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
> reproduce:
>         wget
> https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O
> ~/bin/make.cross chmod +x ~/bin/make.cross
>         git checkout 9037d4b98b255979c6636045794775f5a89cc623
>         # save the attached .config to linux build tree
>         make.cross ARCH=arm64
> 
> All errors (new ones prefixed by >>):
> 
>    drivers/gpu/drm/rcar-du/rcar_du_vsp.c: In function 
'rcar_du_vsp_plane_atomic_duplicate_state':
> >> drivers/gpu/drm/rcar-du/rcar_du_vsp.c:317:6: error: 'struct
> >> rcar_du_vsp_plane_state' has no member named 'alpha'
>      copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha;
>          ^~
>    drivers/gpu/drm/rcar-du/rcar_du_vsp.c:317:53: error: 'struct
> rcar_du_vsp_plane_state' has no member named 'alpha' copy->alpha =
> to_rcar_vsp_plane_state(plane->state)->alpha;
>                                                         ^~

This error is caused by a conflict between commit 75a07f399cd4 (drm: rcar-du: 
Zero-out sg_tables when duplicating plane state) present in my R-Car DU pull 
request sent for the DRM tree and commit 301a9b8d5456 ("drm/rcar-du: Convert 
to the new generic alpha property") present in drm-misc-next but not merged in 
the drm tree yet.

Dave, how would you like to handle this ? I can rebase my drm/du/next branch 
on top of your tree once you merge drm-misc-next and send a new pull request, 
but I'd like to avoid missing the v4.18 merge window. Another option would be 
to handle the error in the drm-misc-next merge. If there's an easier option, 
please let me know how I can help.

> vim +317 drivers/gpu/drm/rcar-du/rcar_du_vsp.c
> 
> 6d62ef3a Laurent Pinchart 2015-09-07  303
> 6d62ef3a Laurent Pinchart 2015-09-07  304  static struct drm_plane_state *
> 6d62ef3a Laurent Pinchart 2015-09-07  305 
> rcar_du_vsp_plane_atomic_duplicate_state(struct drm_plane *plane) 6d62ef3a
> Laurent Pinchart 2015-09-07  306  {
> 6d62ef3a Laurent Pinchart 2015-09-07  307  	struct rcar_du_vsp_plane_state
> *copy; 6d62ef3a Laurent Pinchart 2015-09-07  308
> 6d62ef3a Laurent Pinchart 2015-09-07  309  	if (WARN_ON(!plane->state))
> 6d62ef3a Laurent Pinchart 2015-09-07  310  		return NULL;
> 6d62ef3a Laurent Pinchart 2015-09-07  311
> 75a07f39 Laurent Pinchart 2018-01-17  312  	copy = kzalloc(sizeof(*copy),
> GFP_KERNEL); 6d62ef3a Laurent Pinchart 2015-09-07  313  	if (copy == NULL)
> 6d62ef3a Laurent Pinchart 2015-09-07  314  		return NULL;
> 6d62ef3a Laurent Pinchart 2015-09-07  315
> 6d62ef3a Laurent Pinchart 2015-09-07  316 
> 	__drm_atomic_helper_plane_duplicate_state(plane, &copy->state); 75a07f39
> Laurent Pinchart 2018-01-17 @317  	copy->alpha =
> to_rcar_vsp_plane_state(plane->state)->alpha; 6d62ef3a Laurent Pinchart
> 2015-09-07  318
> 6d62ef3a Laurent Pinchart 2015-09-07  319  	return &copy->state;
> 6d62ef3a Laurent Pinchart 2015-09-07  320  }
> 6d62ef3a Laurent Pinchart 2015-09-07  321
> 
> :::::: The code at line 317 was first introduced by commit
> :::::: 75a07f399cd43bc7fb41a13723fbe04e61c5c470 drm: rcar-du: Zero-out
> :::::: sg_tables when duplicating plane state
> :::::: 
> :::::: TO: Laurent Pinchart <laurent.pinchart+renesas at ideasonboard.com>
> :::::: CC: Laurent Pinchart <laurent.pinchart+renesas at ideasonboard.com>
> 
> ---
> 0-DAY kernel test infrastructure                Open Source Technology
> Center https://lists.01.org/pipermail/kbuild-all                   Intel
> Corporation


-- 
Regards,

Laurent Pinchart